From 28f3b13c63fd5ac5210caaa7b63b94e65aeda6b2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 18 Jul 2019 20:28:05 +0200
Subject: [PATCH] Change Dockerfile to bind to 0.0.0.0 instead of
docker-compose.yml (#11351)
---
Dockerfile | 1 +
docker-compose.yml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 3acbc9d4ce..d8c7e0f0c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,6 +112,7 @@ ENV NODE_ENV="production"
# Tell rails to serve static files
ENV RAILS_SERVE_STATIC_FILES="true"
+ENV BIND="0.0.0.0"
# Set the run user
USER mastodon
diff --git a/docker-compose.yml b/docker-compose.yml
index f3fe6cfd0b..7406849663 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
image: tootsuite/mastodon
restart: always
env_file: .env.production
- command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000 -b '0.0.0.0'"
+ command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
networks:
- external_network
- internal_network
@@ -58,7 +58,7 @@ services:
image: tootsuite/mastodon
restart: always
env_file: .env.production
- command: BIND=0.0.0.0 node ./streaming
+ command: node ./streaming
networks:
- external_network
- internal_network
--
GitLab