diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
| commit | 447d7e612753d69f043e08ebb228b21e411c8b4a (patch) | |
| tree | 80caebcff2b131898f620f89ad0858d44530d30f /docker-compose.yml | |
| parent | 43a9a781a443a6b9296431fbcc4285b3ca6a1a57 (diff) | |
| parent | ff44b2e92d496c6027b20157fea6ebd885906bea (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 55b419e98..836cb00b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: web: build: . - image: gargron/mastodon + image: tootsuite/mastodon restart: always env_file: .env.production command: bundle exec rails s -p 3000 -b '0.0.0.0' @@ -52,10 +52,10 @@ services: streaming: build: . - image: gargron/mastodon + image: tootsuite/mastodon restart: always env_file: .env.production - command: npm run start + command: yarn start networks: - external_network - internal_network @@ -67,7 +67,7 @@ services: sidekiq: build: . - image: gargron/mastodon + image: tootsuite/mastodon restart: always env_file: .env.production command: bundle exec sidekiq -q default -q mailers -q pull -q push |