From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 3 Mar 2015 14:15:00 +0000 (+0100)
Subject: Docker-compose: get datamedia volume from examples/sandbox/media + clean-up
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=15a41bd352e412c713c0c48900fe90020eba07ae;p=timeside.git

Docker-compose: get datamedia volume from examples/sandbox/media + clean-up
---

diff --git a/docker-compose.yml b/docker-compose.yml
index 338668f..922c385 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ datadb:
 datamedia:
   image: debian:wheezy
   volumes:
-    - /media
+    - ./examples/sandbox/media:/media
   command: /bin/true
 
 datastatic:
@@ -32,11 +32,8 @@ nginx:
   image: nginx
   ports:
     - "8000:80"
-    - "8001:443"
   volumes:
     - ./examples/deploy/nginx/sites-enabled/app.conf:/etc/nginx/conf.d/default.conf
-    - /media
-    #- ./examples/deploy/static/:/var/www/static
   volumes_from:
     - datastatic
     - datamedia 
@@ -47,7 +44,6 @@ app:
   build: .
   volumes:
     - .:/opt/TimeSide
-    #- ./examples/deploy/static/:/var/www/static
   volumes_from:
     - datastatic
     - datamedia