rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch docker-compose to version 3. (#2747) 

* Switch docker-compose to version 3.

It allow possibility to Deploy Mastodon in a Swarm cluster directly from the compose file.

* switch to compose v3 without depend.
shrike
Valentin Ouvrard 2017-05-05 00:56:05 +11:00 committed by Eugen Rochko
parent 0cdcf32865
commit 75bd141e22
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker-compose.yml
View File

@ -1,4 +1,4 @@
version: '2' version: '3'
services: services:
db: db:
@ -15,13 +15,9 @@ services:
# volumes: # volumes:
# - ./redis:/data # - ./redis:/data
app: web:
build: . build: .
image: gargron/mastodon image: gargron/mastodon
web:
extends:
service: app
restart: always restart: always
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'
@ -36,8 +32,8 @@ services:
- ./public/system:/mastodon/public/system - ./public/system:/mastodon/public/system
streaming: streaming:
extends: build: .
service: app image: gargron/mastodon
restart: always restart: always
env_file: .env.production env_file: .env.production
command: npm run start command: npm run start
@ -48,8 +44,8 @@ services:
- redis - redis
sidekiq: sidekiq:
extends: build: .
service: app image: gargron/mastodon
restart: always restart: always
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