Update env files, add nginx autonomous env

diff --git a/bin b/bin
index 08d3ecfc6f651c233f0f5c98113303e2fbdbc1b1..00c343deceb5036a55bf91b1dd19f04e82173dea 160000 (submodule)
--- a/bin
+++ b/bin
@@ -1 +1 @@
-Subproject commit 08d3ecfc6f651c233f0f5c98113303e2fbdbc1b1
+Subproject commit 00c343deceb5036a55bf91b1dd19f04e82173dea

diff --git a/docker-compose.yml b/docker-compose.yml
index 3e37e1db4ec22e572b757e42f52e64e00bc8aa92..ce072e9da633ac4a67c2bc5f8b4e959df7dd8cfc 100644 (file)
--- a/docker-compose.yml
+++ b/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

diff --git a/env/dev.yml b/env/dev.yml
index 45617a328e848f595411a82b719495ea0f1f393b..71ba3ae0aa2e72c0ed0df58964a6ba907a9bb984 100644 (file)
--- a/env/dev.yml
+++ b/env/dev.yml
@@ -1,7 +1,8 @@
 
 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

diff --git a/env/prod.yml b/env/prod.yml
index cbdcd42d580f7ed226692d7eeee053d1ff662b75..6b747069b0b1e07ce724de02e933650e5951b484 100644 (file)
--- a/env/prod.yml
+++ b/env/prod.yml
@@ -1,14 +1,4 @@
 
 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

diff --git a/env/staging.yml b/env/staging.yml
index 407adc0a8776f2784c34189be8cbfeebd8ec020d..39b1c7ea7215833b9e110ebaaa05254daee6aeb6 100644 (file)
--- a/env/staging.yml
+++ b/env/staging.yml
@@ -1,15 +1,5 @@
 
 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"

diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization
index e4a3a5ee9eafb88ec317073c262952d6d2110fb8..d1c42a926837913bbbe0aa0d30a6599556e997bc 160000 (submodule)
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@ -1 +1 @@
-Subproject commit e4a3a5ee9eafb88ec317073c262952d6d2110fb8
+Subproject commit d1c42a926837913bbbe0aa0d30a6599556e997bc

diff --git a/lib/mezzanine-organization-themes b/lib/mezzanine-organization-themes
index f0f08ec810d9e412b74b036d3585386a226c0cc4..0178b88b49e3999015fce7524961877321a24878 160000 (submodule)
--- a/lib/mezzanine-organization-themes
+++ b/lib/mezzanine-organization-themes
@@ -1 +1 @@
-Subproject commit f0f08ec810d9e412b74b036d3585386a226c0cc4
+Subproject commit 0178b88b49e3999015fce7524961877321a24878