From: Chocobozzz <me@florianbigard.com>
Date: Tue, 29 May 2018 08:04:04 +0000 (+0200)
Subject: Copy custom-environment-variables.yaml on docker startup
X-Git-Tag: v1.0.0-beta.8~86
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=0c985c5a039c3dd942fa78330e83d5434bed66b0;p=github%2FChocobozzz%2FPeerTube.git

Copy custom-environment-variables.yaml on docker startup
---

diff --git a/support/docker/production/docker-entrypoint.sh b/support/docker/production/docker-entrypoint.sh
index 447cf7fa4..888fd8f34 100755
--- a/support/docker/production/docker-entrypoint.sh
+++ b/support/docker/production/docker-entrypoint.sh
@@ -6,8 +6,9 @@ if [ -z "$(ls -A /config)" ]; then
     cp /app/support/docker/production/config/* /config
 fi
 
-# Always copy default configuration file, in cases where new keys were added
+# Always copy default and custom env configuration file, in cases where new keys were added
 cp /app/config/default.yaml /config
+cp /app/config/custom-environment-variables.yaml /config
 chown -R peertube:peertube /config
 
 # first arg is `-f` or `--some-option`