diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-18 18:48:12 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-18 18:48:12 -0500 |
commit | 16d5217502a09132dc14a3a808036af5dbcb73dd (patch) | |
tree | deb7b81919e5f8082b7d848b0b8df4787d37f001 /docker-compose.yml | |
parent | 813da6788e5129579db04e89aac3076902af2c7a (diff) | |
parent | ff87d1bc3ecdb81ff5c523f0964ecf223a503d30 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json
Diffstat (limited to 'docker-compose.yml')
-rw-r--r-- | docker-compose.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 836cb00b8..8058326dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: - external_network - internal_network ports: - - "3000:3000" + - "127.0.0.1:3000:3000" depends_on: - db - redis @@ -60,7 +60,7 @@ services: - external_network - internal_network ports: - - "4000:4000" + - "127.0.0.1:4000:4000" depends_on: - db - redis |