Merge branch 'develop' into pr/1285

[github/Chocobozzz/PeerTube.git] / support / docker / production / docker-entrypoint.sh

diff --git a/support/docker/production/docker-entrypoint.sh b/support/docker/production/docker-entrypoint.sh
index 8ee968b3da833d9f9bbff3a62595b4a63c5030a8..7dd626b9f02ae06d74cdf474ba90afedc1542d0a 100755 (executable)
--- a/support/docker/production/docker-entrypoint.sh
+++ b/support/docker/production/docker-entrypoint.sh
@@ -4,10 +4,13 @@ set -e
 # Populate config directory
 if [ -z "$(ls -A /config)" ]; then
     cp /app/support/docker/production/config/* /config
-    cp /app/config/default.yaml /config
-    chown -R peertube:peertube /config
 fi
 
+# Always copy default and custom env configuration file, in cases where new keys were added
+cp /app/config/default.yaml /config
+cp /app/support/docker/production/config/custom-environment-variables.yaml /config
+find /config ! -user peertube -exec chown peertube:peertube {} \;
+
 # first arg is `-f` or `--some-option`
 # or first arg is `something.conf`
 if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
@@ -16,7 +19,7 @@ fi
 
 # allow the container to be started with `--user`
 if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then
-    chown -R peertube:peertube /data
+    find /data ! -user peertube -exec  chown peertube:peertube {} \;
     exec gosu peertube "$0" "$@"
 fi