fix sandbox and composition

diff --git a/docker-compose.yml b/docker-compose.yml
index 32c8605867e966206ca16d61de84f2a5b236ad33..fbf255ae9eea4fd68ca80cf0f0ba6b7331db3d9c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,9 +52,6 @@ home:
 
 db:
   image: mysql
-  volumes_from:
-    - lib
-    - log
   environment:
     - MYSQL_ROOT_PASSWORD=mysecretpassword
     - MYSQL_DATABASE=sandbox
@@ -65,8 +62,6 @@ rabbitmq:
   image: rabbitmq:3-management
   ports:
     - "15672:15672"
-  expose:
-    - "5672"
 
 app:
   build: .
@@ -89,11 +84,12 @@ worker:
   build: .
   volumes_from:
     - app
+    - home
+    - log
   command: /bin/sh /opt/Telemeta/examples/deploy/celery_app.sh
   links:
     - rabbitmq
     - db
-    - app
 
 nginx:
   image: nginx

diff --git a/examples/deploy/celery_app.sh b/examples/deploy/celery_app.sh
index ac1b1c76646e158b646d6ddfb852a26a8cd9dc77..856d3eb43f31908c8415eba8e12be6394e3a4f24 100644 (file)
--- a/examples/deploy/celery_app.sh
+++ b/examples/deploy/celery_app.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 # paths
-app='/opt/Telemeta/'
-sandbox='/home/sandbox/'
-manage=$sandbox'manage.py'
-wsgi=$sandbox'wsgi.py'
+app_dir='/opt/Telemeta'
+sandbox='/home/sandbox'
+manage=$sandbox'/manage.py'
+wsgi=$sandbox'/wsgi.py'
 
-sh $app/examples/deploy/wait.sh
+sh $app_dir/examples/deploy/wait.sh
 
 # Starting celery worker with the --autoreload option will enable the worker to watch for file system changes
 # This is an experimental feature intended for use in development only

diff --git a/examples/deploy/start_app.sh b/examples/deploy/start_app.sh
index 858d5f0be6d18687bc704ae2bd1de8377891888d..49199602ce6a55f29a8e22aa81cc28af2198851a 100644 (file)
--- a/examples/deploy/start_app.sh
+++ b/examples/deploy/start_app.sh
@@ -1,19 +1,20 @@
 #!/bin/sh
 
 # paths
-app='/opt/Telemeta/'
-static=$app'telemeta/static/'
-sandbox='/home/sandbox/'
-manage=$sandbox'manage.py'
-wsgi=$sandbox'wsgi.py'
+app_dir='/opt/Telemeta'
+static=$app_dir'/telemeta/static/'
+sandbox='/home/sandbox'
+manage=$sandbox'/manage.py'
+wsgi=$sandbox'/wsgi.py'
 
-sh $app/examples/deploy/wait.sh
+sh $app_dir/examples/deploy/wait.sh
 
 # django init
 python $manage syncdb --noinput
 python $manage migrate --noinput
 python $manage collectstatic --noinput
 python $manage telemeta-create-admin-user
+python $manage timeside-create-boilerplate
 
 # static files auto update
 watchmedo shell-command --patterns="*.js;*.css" --recursive \