make app setup more and more generic, do not copy media in app volumes

diff --git a/Dockerfile b/Dockerfile
index 7451326fd3a2b8d2bf9db4953c523c35fa0d6235..8b0fce37daa78ed13e5a8f714c64e1190aba1749 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,14 +21,12 @@ MAINTAINER Guillaume Pellerin <yomguy@parisson.com>, Thomas fillon <thomas@paris
 
 RUN mkdir /opt/app
 RUN mkdir /opt/src
-RUN mkdir /opt/src/Telemeta
+RUN mkdir /opt/src/app
 
-COPY . /opt/src/Telemeta
-WORKDIR /opt/src/Telemeta
+COPY . /opt/src/app
+WORKDIR /opt/src/app
 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/docker-compose.yml b/docker-compose.yml
index 0d7f915293ce9d5c99e1ed49e3e6e95dbe9850e3..1d653d82d0f48dbed8c66425a15604ae614750bf 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,7 +50,7 @@ app:
   build: .
   volumes:
     - ./app/:/opt/app
-    - ./:/opt/src/Telemeta
+    - ./telemeta/:/opt/src/app/telemeta
   volumes_from:
     - media
   command: /bin/sh deploy/start_app.sh