From f3e1595063f57eb89b9c2ef973f0442e176bd507 Mon Sep 17 00:00:00 2001 From: Matheus Fernandes Date: Mon, 20 Nov 2017 17:14:22 -0200 Subject: [PATCH] Update docker-compose Signed-off-by: Matheus Fernandes --- docker-compose.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7b2e395f..8d5ddc06 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,10 @@ version: '2.3' services: nginx: - image: nginx + image: labhackercd/nginx-edemocracia depends_on: - colab volumes: - - ./misc/etc/nginx/conf.d/:/etc/nginx/conf.d/:z - colab_assets:/var/labhacker/colab/public:z - audiencias:/var/labhacker/audiencias:z - wikilegis:/var/labhacker/wikilegis:z @@ -13,6 +12,8 @@ services: - "8000:80" links: - 'audienciasweb' + environment: + NAME_RESOLVER: '127.0.0.11' db: image: postgres @@ -73,8 +74,7 @@ services: expose: - "8000" depends_on: - db: - condition: service_healthy + - db redis: image: redis:alpine @@ -128,10 +128,8 @@ services: expose: - "8000" depends_on: - db: - condition: service_healthy - redis: - condition: service_healthy + - db + - redis audienciasworker: image: labhackercd/audiencias-publicas @@ -177,7 +175,7 @@ services: - 'audienciasweb' wikilegisweb: - image: labhackercd/wikilegis + image: labhackercd/wikilegis:1.3.0 command: ./start.sh restart: on-failure links: @@ -221,10 +219,11 @@ services: expose: - "8000" depends_on: - db: - condition: service_healthy + - db volumes: + colab_data: + driver: local colab_assets: driver: local audiencias: