X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=support%2Fdocker%2Fproduction%2Fdocker-entrypoint.sh;h=7dd626b9f02ae06d74cdf474ba90afedc1542d0a;hb=745437e3ab402d5b8f85de6e9c09c3b6092e5904;hp=4099a19847f7e15168aa920a7c34b38bdfd61773;hpb=4aeb67a569b30a233dcff2eaf9c564d62ccd6497;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/support/docker/production/docker-entrypoint.sh b/support/docker/production/docker-entrypoint.sh
index 4099a1984..7dd626b9f 100755
--- a/support/docker/production/docker-entrypoint.sh
+++ b/support/docker/production/docker-entrypoint.sh
@@ -1,6 +1,16 @@
 #!/bin/sh
 set -e
 
+# Populate config directory
+if [ -z "$(ls -A /config)" ]; then
+    cp /app/support/docker/production/config/* /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
@@ -8,8 +18,8 @@ if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
 fi
 
 # allow the container to be started with `--user`
-if [ "$1" = 'npm' -a "$(id -u)" != '0' ]; then
-    chown -R peertube:peertube /data
+if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then
+    find /data ! -user peertube -exec  chown peertube:peertube {} \;
     exec gosu peertube "$0" "$@"
 fi