aboutsummaryrefslogtreecommitdiffhomepage
path: root/support/docker
diff options
context:
space:
mode:
authorFelix Ableitner <me@nutomic.com>2019-05-21 12:25:00 +0200
committerChocobozzz <chocobozzz@cpy.re>2019-05-21 16:59:42 +0200
commit1bab2bbc1152414289a6725bf0ae2839ef1d8c1e (patch)
treeee2ca8efef5989c5d0306be83a9c41c7610ff1b3 /support/docker
parent21d141c296541f41e399ec68aa7fa85e53d0dcb8 (diff)
downloadPeerTube-1bab2bbc1152414289a6725bf0ae2839ef1d8c1e.tar.gz
PeerTube-1bab2bbc1152414289a6725bf0ae2839ef1d8c1e.tar.zst
PeerTube-1bab2bbc1152414289a6725bf0ae2839ef1d8c1e.zip
Fix docker-compose setup so Peertube sees correct IP
Diffstat (limited to 'support/docker')
-rw-r--r--support/docker/production/.env3
-rw-r--r--support/docker/production/docker-compose.yml7
2 files changed, 8 insertions, 2 deletions
diff --git a/support/docker/production/.env b/support/docker/production/.env
index 7b9092642..c8393d0ce 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -5,8 +5,7 @@ PEERTUBE_WEBSERVER_PORT=443
5PEERTUBE_WEBSERVER_HTTPS=true 5PEERTUBE_WEBSERVER_HTTPS=true
6# If you need more than one IP as trust_proxy 6# If you need more than one IP as trust_proxy
7# pass them as a comma separated array: 7# pass them as a comma separated array:
8PEERTUBE_TRUST_PROXY=["127.0.0.1"] 8PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
9#PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "192.168.1.0/24"]
10#PEERTUBE_SMTP_USERNAME= 9#PEERTUBE_SMTP_USERNAME=
11#PEERTUBE_SMTP_PASSWORD= 10#PEERTUBE_SMTP_PASSWORD=
12PEERTUBE_SMTP_HOSTNAME=postfix 11PEERTUBE_SMTP_HOSTNAME=postfix
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index df21a14d4..263fb6e95 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -72,3 +72,10 @@ services:
72 labels: 72 labels:
73 traefik.enable: "false" 73 traefik.enable: "false"
74 restart: "always" 74 restart: "always"
75
76networks:
77 default:
78 ipam:
79 driver: default
80 config:
81 - subnet: 172.18.0.0/16