Skip to content
Snippets Groups Projects
Commit 2c6c8653 authored by Pierre Ozoux's avatar Pierre Ozoux
Browse files

Fix docker-compose

parent 30ebf000
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,8 @@ services: ...@@ -10,6 +10,8 @@ services:
image: postgres:alpine image: postgres:alpine
networks: networks:
- back - back
volumes:
- ./data/postgres:/var/lib/postgresql/data
redis: redis:
restart: always restart: always
image: redis:alpine image: redis:alpine
...@@ -18,7 +20,7 @@ services: ...@@ -18,7 +20,7 @@ services:
web: web:
image: nginx image: nginx
volumes: volumes:
- ./nginx.conf:/etc/nginx/nginx.comf - ./nginx.conf:/etc/nginx/nginx.conf
volumes_from: volumes_from:
- app - app
depends_on: depends_on:
...@@ -27,12 +29,11 @@ services: ...@@ -27,12 +29,11 @@ services:
networks: networks:
- back - back
- lb_web - lb_web
env: environment:
- VIRTUAL_HOST - VIRTUAL_HOST
app: app:
restart: always restart: always
build: . image: gargron/mastodon
image: tootsuite/mastodon
env_file: .env.production env_file: .env.production
command: bundle exec rails s -p 3000 -b '0.0.0.0' command: bundle exec rails s -p 3000 -b '0.0.0.0'
depends_on: depends_on:
...@@ -41,12 +42,12 @@ services: ...@@ -41,12 +42,12 @@ services:
volumes: volumes:
- ./public/assets:/mastodon/public/assets - ./public/assets:/mastodon/public/assets
- ./public/system:/mastodon/public/system - ./public/system:/mastodon/public/system
- /mastodon/public
networks: networks:
- back - back
streaming: streaming:
restart: always restart: always
build: . image: gargron/mastodon
image: tootsuite/mastodon
env_file: .env.production env_file: .env.production
command: npm run start command: npm run start
depends_on: depends_on:
...@@ -56,8 +57,7 @@ services: ...@@ -56,8 +57,7 @@ services:
- back - back
sidekiq: sidekiq:
restart: always restart: always
build: . image: gargron/mastodon
image: tootsuite/mastodon
env_file: .env.production env_file: .env.production
command: bundle exec sidekiq -q default -q mailers -q pull -q push command: bundle exec sidekiq -q default -q mailers -q pull -q push
depends_on: depends_on:
...@@ -67,4 +67,3 @@ services: ...@@ -67,4 +67,3 @@ services:
- ./public/system:/mastodon/public/system - ./public/system:/mastodon/public/system
networks: networks:
- back - back
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment