Docker-compose: Update draft config files

diff --git a/Dockerfile b/Dockerfile
index 6b871761ef2538d91587b05cb30273dbd075465c..3b1241483c22c237c03baad32fc44807b1454ce7 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,18 +57,17 @@ RUN conda install --file conda-requirements.txt  && \
 # Install Aubio
 RUN conda install -c thomasfillon aubio
 
+# Link Yaafe in site-packages 
+RUN ln -s /usr/lib/python2.7/dist-packages/yaafelib /opt/miniconda/lib/python2.7
+
 # clone app
 ADD . /opt/TimeSide
 WORKDIR /opt/TimeSide
 
-
 RUN pip install -r requirements.txt
 RUN conda list
 
-# Link Yaafe in site-packages 
-RUN ln -s /usr/lib/python2.7/dist-packages/yaafelib /opt/miniconda/lib/python2.7
-
-# setup all the configfiles
+# setup all the configfiles  --> Gérer dans le container Nginx
 #RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 #RUN rm /etc/nginx/sites-enabled/default
 #RUN ln -s /opt/TimeSide/examples/deploy/nginx-app.conf /etc/nginx/sites-enabled/

diff --git a/docker-compose.yml b/docker-compose.yml
index b1da47da6920271d2933d64047bedbd8845e8dee..31c661494ee0c29b398020e6f6fe6d88c580d361 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-
 data:
   image: tianon/true
   volumes:
@@ -15,8 +14,8 @@ nginx:
     - "8080:80"
   volumes:
     - ./examples/deploy/nginx-app.conf:/etc/nginx/sites-enabled/
-#    #- ./web/media:/media:ro
-#    #- ./web//static:/static:ro
+    #  --> media
+    #  --> static
   links:
     - app
 
@@ -24,5 +23,9 @@ app:
   build: .
   volumes:
     - .:/opt/TimeSide
+  command:
+    - /opt/TimeSide/examples/sandbox/manage.py syncdb --noinput
+    - /opt/TimeSide/examples/sandbox/manage.py migrate --noinput
+    - /opt/TimeSide/examples/sandbox/manage.py collectstatic --noinput
   ports:
     - "8000:8000"