From 2c6c865364b9cc075cee11cce3b67a5ba58d830b Mon Sep 17 00:00:00 2001 From: pierreozoux <pierre@ozoux.net> Date: Fri, 7 Apr 2017 00:32:52 +0100 Subject: [PATCH] Fix docker-compose --- docker-compose.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2a0af4d..5e56844 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,8 @@ services: image: postgres:alpine networks: - back + volumes: + - ./data/postgres:/var/lib/postgresql/data redis: restart: always image: redis:alpine @@ -18,7 +20,7 @@ services: web: image: nginx volumes: - - ./nginx.conf:/etc/nginx/nginx.comf + - ./nginx.conf:/etc/nginx/nginx.conf volumes_from: - app depends_on: @@ -27,12 +29,11 @@ services: networks: - back - lb_web - env: + environment: - VIRTUAL_HOST app: restart: always - build: . - image: tootsuite/mastodon + image: gargron/mastodon env_file: .env.production command: bundle exec rails s -p 3000 -b '0.0.0.0' depends_on: @@ -41,12 +42,12 @@ services: volumes: - ./public/assets:/mastodon/public/assets - ./public/system:/mastodon/public/system + - /mastodon/public networks: - back streaming: restart: always - build: . - image: tootsuite/mastodon + image: gargron/mastodon env_file: .env.production command: npm run start depends_on: @@ -56,8 +57,7 @@ services: - back sidekiq: restart: always - build: . - image: tootsuite/mastodon + image: gargron/mastodon env_file: .env.production command: bundle exec sidekiq -q default -q mailers -q pull -q push depends_on: @@ -67,4 +67,3 @@ services: - ./public/system:/mastodon/public/system networks: - back - -- GitLab