Cloudasr works with docker-machine.

UFAL-DSG · Sep 3, 2015 · 455b092 · 455b092
1 parent d10d9c2
commit 455b092
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 SHELL=/bin/bash
-IP=`(boot2docker ip || (ip addr show docker0 | grep -Po 'inet \K[\d.]+')) 2> /dev/null`
+IP=`(docker-machine ip dev || (ip addr show docker0 | grep -Po 'inet \K[\d.]+')) 2> /dev/null`
 DEMO_URL=http://${IP}:8003/demo/en-towninfo
 MONITOR_URL=http://${IP}:8001/
 MESOS_SLAVE_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' mesos-slave`
@@ -22,7 +22,7 @@ MYSQL_USER=cloudasr
 MYSQL_PASSWORD=cloudasr
 MYSQL_DATABASE=cloudasr
 MYSQL_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' mysql`
-MYSQL_PATH=`(boot2docker ssh 'mkdir /home/docker/mysql_data ; echo /home/docker/mysql_data') 2> /dev/null || echo ${CURDIR}/mysql_data`
+MYSQL_PATH=`docker-machine ssh dev '(mkdir /home/docker/mysql_data ; echo /home/docker/mysql_data) 2> /dev/null' || echo ${CURDIR}/mysql_data`
 MYSQL_CONNECTION_STRING="mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_IP}/${MYSQL_DATABASE}?charset=utf8"
 
 SHARED_VOLUME=${CURDIR}/cloudasr/shared/cloudasr:/usr/local/lib/python2.7/dist-packages/cloudasr
@@ -147,6 +147,7 @@ mysql_data:
 	touch mysql_data 2> /dev/null || echo "MYSQL PREPARED"
 
 run: mysql_data
+	@echo docker run ${MYSQL_OPTS} -d mysql
 	docker run ${MYSQL_OPTS} -d mysql
 	docker run ${WEB_OPTS} -d ufaldsg/cloud-asr-web
 	docker run ${API_OPTS} -d ufaldsg/cloud-asr-api

diff --git a/deployment/run_locally.py b/deployment/run_locally.py
@@ -2,7 +2,8 @@
 import sys
 import json
 
-IP = "`(boot2docker ip || (ip addr show docker0 | grep -Po 'inet \K[\d.]+')) 2> /dev/null`"
+# FIXME we suppose the virtaulbox machine is named dev
+IP = "`(docker-machine ip dev || (ip addr show docker0 | grep -Po 'inet \K[\d.]+')) 2> /dev/null`"
 CURDIR = os.getcwd()
 
 API_HOST_PORT = 8000
@@ -20,7 +21,8 @@
 MYSQL_USER="cloudasr"
 MYSQL_PASSWORD="cloudasr"
 MYSQL_DATABASE="cloudasr"
-MYSQL_PATH="`(boot2docker ssh 'mkdir /home/docker/mysql_data ; echo /home/docker/mysql_data') 2> /dev/null || echo %s/mysql_data`" % CURDIR
+# FIXME we suppose the virtaulbox machine is named dev
+MYSQL_PATH="`docker-machine ssh dev '(mkdir /home/docker/mysql_data ; echo /home/docker/mysql_data) 2> /dev/null' || echo %s/mysql_data`" % CURDIR
 
 def format_name(domain, name):
     return "%s-%s" % (domain.replace('.', '-'), name)

diff --git a/docs/0_machine_requirements.md b/docs/0_machine_requirements.md
@@ -0,0 +1,14 @@
+Your machine requirements
+=========================
+- 60GB of memory
+- 8GB of RAM
+- 4 cores minimum 8 cores recommended
+
+
+OSX docker-machine
+~~~~~~~~~~~~~~~~~~
+Example command to create local VirtualBox machine
+
+```
+docker-machine create --driver virtualbox --virtualbox-cpu-count "8" --virtualbox-memory 8192 --virtualbox-disk-size "60000" dev2
+```