Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev

.travis.yml

@@ -19,7 +19,7 @@ install:
 
 script:
   - docker-compose run app pip freeze
-  - docker-compose -f docker-compose.yml -f env/staging.yml up -d
+  - docker-compose -f docker-compose.yml -f env/build.yml up -d
   - docker-compose run app python manage.py test
   - sleep 180
   - curl --fail --retry 10 --retry-delay 5  -v "$(docker-compose port nginx 8040)/"

bin @ 00c343de

-Subproject commit 08d3ecfc6f651c233f0f5c98113303e2fbdbc1b1
+Subproject commit 00c343deceb5036a55bf91b1dd19f04e82173dea

docker-compose.yml

@@ -19,44 +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:latest-dev
-  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
+    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" 
+    links:
+        - db
+    environment:
+        - DEBUG=False
 
 nginx:
     image: nginx

env/build.yml

+
+app:
+    build: .
+

env/dev.yml

 
 app:
-  build: .
-  ports:
-    - "9040:8000"
-  environment:
-    - DEBUG=True
+    image: ircamweb/mezzo:latest-dev
+    command: /bin/sh bin/app.sh --runserver
+    ports:
+        - "9000:8000"
+    environment:
+        - DEBUG=True

env/nginx.yml

+
+nginx:
+    image: nginx    
+    ports:
+        - "8000:80"
+    volumes:
+        - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
+    volumes_from:
+        - var
+    links:
+        - app

env/prod.yml

 
 app:
-  command: /bin/sh bin/app.sh
+    command: /bin/sh bin/app.sh
 
-nginx:
-  image: nginx
-  ports:
-    - "8040:80"
-  volumes:
-    - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
-  volumes_from:
-    - var
-  links:
-    - app

env/staging.yml

 
 app:
-  build: .
-  command: /bin/sh bin/app.sh
-
-nginx:
-  image: nginx
-  ports:
-    - "8040:80"
-  volumes:
-    - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
-  volumes_from:
-    - var
-  links:
-    - app
+    command: /bin/sh bin/app.sh
+    ports:
+        - "8040:8000"

mezzanine-agenda @ a5675960

-Subproject commit 5520a2a1c2d252f4c52dcdea3431a620bca1b626
+Subproject commit a567596002b1be24c54518b8d36eff2569a48a95

mezzanine-organization @ d1c42a92

-Subproject commit 09c4c7c45efc85e4ff025902478bd34b7e3e71dc
+Subproject commit d1c42a926837913bbbe0aa0d30a6599556e997bc

mezzanine-organization-themes @ 0178b88b

-Subproject commit 898aa3f81cb3db53992a77f0425f34f2cd8f7670
+Subproject commit 0178b88b49e3999015fce7524961877321a24878