From 91852d0db3bebbc320b0effb21c1e2fb3894a4b5 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 13 Apr 2018 12:04:05 +0200 Subject: [PATCH] Update env files, add nginx autonomous env --- bin | 2 +- docker-compose.yml | 70 ++++++++++++++++--------------- env/dev.yml | 11 ++--- env/prod.yml | 12 +----- env/staging.yml | 16 ++----- lib/mezzanine-organization | 2 +- lib/mezzanine-organization-themes | 2 +- 7 files changed, 49 insertions(+), 66 deletions(-) diff --git a/bin b/bin index 08d3ecfc..00c343de 160000 --- a/bin +++ b/bin @@ -1 +1 @@ -Subproject commit 08d3ecfc6f651c233f0f5c98113303e2fbdbc1b1 +Subproject commit 00c343deceb5036a55bf91b1dd19f04e82173dea diff --git a/docker-compose.yml b/docker-compose.yml index 3e37e1db..ce072e9d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,44 +19,46 @@ # Guillaume Pellerin 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 45617a32..71ba3ae0 100644 --- 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 cbdcd42d..6b747069 100644 --- 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 407adc0a..39b1c7ea 100644 --- 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 e4a3a5ee..d1c42a92 160000 --- 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 f0f08ec8..0178b88b 160000 --- a/lib/mezzanine-organization-themes +++ b/lib/mezzanine-organization-themes @@ -1 +1 @@ -Subproject commit f0f08ec810d9e412b74b036d3585386a226c0cc4 +Subproject commit 0178b88b49e3999015fce7524961877321a24878 -- 2.39.5