diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-04 03:17:11 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-04 03:17:11 +0000 |
commit | 530fcc1c14d2b7a38c1b734c0b18955f109f0f20 (patch) | |
tree | 43f71f648b65b81849c0081f8afd729546a8b5c2 /docker-compose.yml | |
parent | c14f59c542accd44a12c30b50f8ccca6730fd1b7 (diff) | |
parent | 9da81a16391edfcbda9c748dcd519fb3ebd765e5 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'docker-compose.yml')
-rw-r--r-- | docker-compose.yml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index cfe70c5e8..aaa3a4478 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,6 +13,8 @@ services: redis: restart: always image: redis:4.0-alpine + networks: + - internal_network ### Uncomment to enable REDIS persistance # volumes: # - ./redis:/data @@ -21,6 +25,9 @@ services: 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: @@ -37,6 +44,9 @@ services: restart: always env_file: .env.production command: npm run start + networks: + - external_network + - internal_network ports: - "4000:4000" depends_on: @@ -52,6 +62,14 @@ services: 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 |