From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 3 Mar 2015 14:25:38 +0000 (+0100)
Subject: Merge branch 'feature/docker-compose' of github.com:Parisson/TimeSide into feature... 
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bf8d9084384f533d94667c426165b8c8a7828985;p=timeside.git

Merge branch 'feature/docker-compose' of github.com:Parisson/TimeSide into feature/docker-compose
---

bf8d9084384f533d94667c426165b8c8a7828985
diff --cc docker-compose.yml
index 6162e31,922c385..141e3a7
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -32,14 -32,11 +32,11 @@@ 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 
 +    - datamedia
    links:
      - app