From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 6 Jun 2017 12:39:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e9223e8cc424de9b3129ea53c15bd17500a62c9c;p=telemeta.git

Merge remote-tracking branch 'origin/dev' into crem
---

e9223e8cc424de9b3129ea53c15bd17500a62c9c
diff --cc docker-compose.yml
index 7b82c43a,b064e296..5fe482a1
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -25,10 -25,12 +25,12 @@@
  data:
    image: debian:jessie
    volumes:
 -     - ./data/media/:/srv/media
 -     - ./data/backup/:/srv/backup
 +     - /home/parisson/CREM/Telemeta/media/:/srv/media
-      - ./static/:/srv/static
 +     - /home/parisson/CREM/Telemeta/backup/:/srv/backup
-      - /srv/bower
+      - ./data/static:/srv/static
+      - ./data/bower:/srv/bower
+      - ./data/log/nginx:/var/log/nginx
+      - ./data/log/uwsgi:/var/log/uwsgi
    command: "true"
  
  db: