From: Felix Ableitner <me@nutomic.com>
Date: Tue, 21 May 2019 10:25:00 +0000 (+0200)
Subject: Fix docker-compose setup so Peertube sees correct IP
X-Git-Tag: v1.4.0-rc.1~230
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1bab2bbc1152414289a6725bf0ae2839ef1d8c1e;p=oweals%2Fpeertube.git

Fix docker-compose setup so Peertube sees correct IP
---

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
 PEERTUBE_WEBSERVER_HTTPS=true
 # If you need more than one IP as trust_proxy
 # pass them as a comma separated array:
-PEERTUBE_TRUST_PROXY=["127.0.0.1"]
-#PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "192.168.1.0/24"]
+PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
 #PEERTUBE_SMTP_USERNAME=
 #PEERTUBE_SMTP_PASSWORD=
 PEERTUBE_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:
     labels:
       traefik.enable: "false"
     restart: "always"
+
+networks:
+  default:
+    ipam:
+      driver: default
+      config:
+      - subnet:  172.18.0.0/16