From 3d8d09b2d41ddc439bd751f0abff1a2655a791b5 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 11 Dec 2015 22:56:21 +0100
Subject: [PATCH] app and sandbox refactoring to avoid media volumes mounting
 inside other volumes.

---
 .dockerignore                   |  3 +++
 Dockerfile                      | 14 ++++++--------
 app/{sandbox => }/celery_app.py |  7 +++----
 app/deploy/celery_app.sh        |  2 +-
 app/deploy/start_app.sh         |  2 --
 app/wsgi.py                     |  3 +--
 docker-compose.yml              |  3 +--
 telemeta/views/pages.py         |  6 ++++--
 8 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 .dockerignore
 rename app/{sandbox => }/celery_app.py (91%)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..2cd65abd
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+media
+static
+var
diff --git a/Dockerfile b/Dockerfile
index 59842d76..7451326f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,16 +21,14 @@ MAINTAINER Guillaume Pellerin <yomguy@parisson.com>, Thomas fillon <thomas@paris
 
 RUN mkdir /opt/app
 RUN mkdir /opt/src
+RUN mkdir /opt/src/Telemeta
 
-WORKDIR /opt/app
-
-ADD requirements.txt /opt/app/
-ADD requirements-dev.txt /opt/app/
-ADD setup.py /opt/app/
-ADD README.rst /opt/app/
-ADD telemeta /opt/app/
-
+COPY . /opt/src/Telemeta
+WORKDIR /opt/src/Telemeta
 RUN pip install -r requirements.txt
 RUN pip install -r requirements-dev.txt --src /opt/src
+RUN python setup.py develop
+
+WORKDIR /opt/app
 
 EXPOSE 8000
diff --git a/app/sandbox/celery_app.py b/app/celery_app.py
similarity index 91%
rename from app/sandbox/celery_app.py
rename to app/celery_app.py
index 7e9d7f86..b7779a0a 100644
--- a/app/sandbox/celery_app.py
+++ b/app/celery_app.py
@@ -1,11 +1,10 @@
 from __future__ import absolute_import
-
-import os
-
+import os, sys
 from celery import Celery
-
 from django.conf import settings
 
+sys.path.append(os.path.dirname('sandbox'))
+
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
 
diff --git a/app/deploy/celery_app.sh b/app/deploy/celery_app.sh
index 87fda082..54215e03 100644
--- a/app/deploy/celery_app.sh
+++ b/app/deploy/celery_app.sh
@@ -14,4 +14,4 @@ sh $app/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
 # see http://celery.readthedocs.org/en/latest/userguide/workers.html#autoreloading
-$manage celery worker --autoreload -A celery_app
+python $manage celery worker --autoreload -A celery_app
diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index 9f6cc120..ddc6479b 100644
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
 # paths
-
-
 app='/opt/app'
 manage=$app'/manage.py'
 wsgi=$app'/wsgi.py'
diff --git a/app/wsgi.py b/app/wsgi.py
index 6b05fff1..58447f97 100644
--- a/app/wsgi.py
+++ b/app/wsgi.py
@@ -4,8 +4,7 @@
 import os
 import sys
 
-here = os.path.dirname(__file__)
-sys.path.append(here)
+sys.path.append(os.path.dirname('sandbox'))
 
 # os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 #
diff --git a/docker-compose.yml b/docker-compose.yml
index 446b5354..0d7f9152 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,8 +42,6 @@ db:
 
 broker:
   image: rabbitmq:3-management
-  ports:
-    - "15672:15672"
 
 search:
   image: elasticsearch:1
@@ -52,6 +50,7 @@ app:
   build: .
   volumes:
     - ./app/:/opt/app
+    - ./:/opt/src/Telemeta
   volumes_from:
     - media
   command: /bin/sh deploy/start_app.sh
diff --git a/telemeta/views/pages.py b/telemeta/views/pages.py
index 8717993b..82f3e4d0 100644
--- a/telemeta/views/pages.py
+++ b/telemeta/views/pages.py
@@ -50,7 +50,10 @@ def language_code(request=None):
     return code.lower()
 
 def project_dir():
-    import settings as settings_mod
+    try:
+        import sandbox.settings as settings_mod
+    except:
+        import settings as settings_mod
     if '__init__.py' in settings_mod.__file__:
         p = os.path.dirname(settings_mod.__file__)
     else:
@@ -115,4 +118,3 @@ def get_page_content(request, relative_path, ignore_slash_issue=False):
 
 class MalformedPagePath(Exception):
     pass
-
-- 
2.39.5