From 627c687aa9583d89700d210a22430f405c3f119e Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 20 Mar 2015 17:21:19 +0100
Subject: [PATCH] fix sandbox and composition

---
 docker-compose.yml            |  8 ++------
 examples/deploy/celery_app.sh | 10 +++++-----
 examples/deploy/start_app.sh  | 13 +++++++------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 32c86058..fbf255ae 100644
--- 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 ac1b1c76..856d3eb4 100644
--- 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 858d5f0b..49199602 100644
--- 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 \
-- 
2.39.5