From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 15 May 2018 14:13:29 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=519f4a7a4792bb22910db6525ddcca85192f7ca0;p=mezzo.git

Merge branch 'dev'
---

519f4a7a4792bb22910db6525ddcca85192f7ca0
diff --cc docker-compose.yml
index 74615c18,ce072e9d..e0807b25
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -19,44 -19,46 +19,46 @@@
  # Guillaume Pellerin <guillaume.pellerin@ircam.fr>
  
  var:
-   image: debian:jessie
-   volumes:
-     - ./var/media:/srv/media
-     - ./var/backup:/srv/backup
-     - ./var/static:/srv/static
-     - ./var/log/uwsgi:/var/log/uwsgi
-     - ./var/log/nginx:/var/log/nginx
-     - ./var/log/app:/var/log/app
-     - ./var/log/cron:/var/log/cron
-     - ./bin:/srv/bin
-     - ./doc:/srv/doc
-     - /srv/bower
-   command: "true"
+     image: debian:jessie
+     volumes:
+         - ./var/media:/srv/media
+         - ./var/backup:/srv/backup
+         - ./var/static:/srv/static
+         - ./var/log/uwsgi:/var/log/uwsgi
+         - ./var/log/nginx:/var/log/nginx
+         - ./var/log/app:/var/log/app
+         - ./var/log/cron:/var/log/cron
+         - ./bin:/srv/bin
+         - ./doc:/srv/doc
+         - /srv/bower
+     command: "true"
  
  db:
-   image: postgres:9.5
-   volumes_from:
-     - var
-   volumes:
-     - ./var/lib/postgresql/data:/var/lib/postgresql/data
-   environment:
-     - POSTGRES_PASSWORD=noodFof2Kna
+     image: postgres:9.5
+     volumes_from:
+         - var
+     volumes:
+         - ./var/lib/postgresql/data:/var/lib/postgresql/data
+     environment:
+         - POSTGRES_PASSWORD=noodFof2Kna
  
  app:
-   image: ircamweb/mezzo
-   command: /bin/sh bin/app.sh --runserver
-   volumes:
-     - ./app:/srv/app
-     - ./lib:/srv/lib
-     - .git:/srv/.git
-   volumes_from:
-     - var
-   expose:
-     - "8000"
-   links:
-     - db
-   environment:
-     - DEBUG=False
 -    image: ircamweb/mezzo:latest-dev
++    image: ircamweb/mezzo
+     command: /bin/sh bin/app.sh --runserver
+     volumes:
+         - ./app:/srv/app
+         - ./lib:/srv/lib
+         - .git:/srv/.git
+     volumes_from:
+         - var
+     expose:
+         - "8000"
+     ports:
 -        - "9000:8000" 
++        - "9000:8000"
+     links:
+         - db
+     environment:
+         - DEBUG=False
  
  nginx:
      image: nginx