diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
| commit | b718fd22374d64534bcfe69932cf562894abed6a (patch) | |
| tree | 311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /support/docker | |
| parent | adb115f5522bea4d52456a9fc5eb4140bb064476 (diff) | |
| parent | 501e961199578129629cf0567033d13efced9904 (diff) | |
| download | PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip | |
Merge branch 'develop' into pr/1285
Diffstat (limited to 'support/docker')
| -rwxr-xr-x | support/docker/production/docker-entrypoint.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/docker/production/docker-entrypoint.sh b/support/docker/production/docker-entrypoint.sh index 6dbbfddf6..7dd626b9f 100755 --- a/support/docker/production/docker-entrypoint.sh +++ b/support/docker/production/docker-entrypoint.sh | |||
| @@ -9,7 +9,7 @@ fi | |||
| 9 | # Always copy default and custom env configuration file, in cases where new keys were added | 9 | # Always copy default and custom env configuration file, in cases where new keys were added |
| 10 | cp /app/config/default.yaml /config | 10 | cp /app/config/default.yaml /config |
| 11 | cp /app/support/docker/production/config/custom-environment-variables.yaml /config | 11 | cp /app/support/docker/production/config/custom-environment-variables.yaml /config |
| 12 | chown -R peertube:peertube /config | 12 | find /config ! -user peertube -exec chown peertube:peertube {} \; |
| 13 | 13 | ||
| 14 | # first arg is `-f` or `--some-option` | 14 | # first arg is `-f` or `--some-option` |
| 15 | # or first arg is `something.conf` | 15 | # or first arg is `something.conf` |
| @@ -19,7 +19,7 @@ fi | |||
| 19 | 19 | ||
| 20 | # allow the container to be started with `--user` | 20 | # allow the container to be started with `--user` |
| 21 | if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then | 21 | if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then |
| 22 | chown -R peertube:peertube /data | 22 | find /data ! -user peertube -exec chown peertube:peertube {} \; |
| 23 | exec gosu peertube "$0" "$@" | 23 | exec gosu peertube "$0" "$@" |
| 24 | fi | 24 | fi |
| 25 | 25 | ||