diff options
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index f280d4ecc..836cb00b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ services: db: restart: always image: postgres:9.6-alpine + networks: + - internal_network ### Uncomment to enable DB persistance # volumes: # - ./postgres:/var/lib/postgresql/data @@ -11,21 +13,38 @@ services: redis: restart: always image: redis:4.0-alpine + networks: + - internal_network ### Uncomment to enable REDIS persistance # volumes: # - ./redis:/data +# es: +# restart: always +# image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.1.3 +# environment: +# - "ES_JAVA_OPTS=-Xms512m -Xmx512m" +# networks: +# - internal_network +#### Uncomment to enable ES persistance +## volumes: +## - ./elasticsearch:/usr/share/elasticsearch/data + 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' + networks: + - external_network + - internal_network ports: - "3000:3000" depends_on: - db - redis +# - es volumes: - ./public/assets:/mastodon/public/assets - ./public/packs:/mastodon/public/packs @@ -33,10 +52,13 @@ 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 ports: - "4000:4000" depends_on: @@ -45,12 +67,21 @@ 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 depends_on: - db - redis + networks: + - external_network + - internal_network volumes: + - ./public/packs:/mastodon/public/packs - ./public/system:/mastodon/public/system + +networks: + external_network: + internal_network: + internal: true |