diff options
| author | Chocobozzz <me@florianbigard.com> | 2022-06-21 09:03:20 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2022-06-21 09:03:20 +0200 |
| commit | 2b621ac0ebe83693bba6354b3482a03ba58143e7 (patch) | |
| tree | 12939dc3d41060ce82c0c18273ac600e1df860d3 /support | |
| parent | a3d15b64711c7b7109d256c82094ee20c2c3df9a (diff) | |
| parent | 494081f89d4d1456b89d830a8e52c98a2c02b0b4 (diff) | |
| download | PeerTube-2b621ac0ebe83693bba6354b3482a03ba58143e7.tar.gz PeerTube-2b621ac0ebe83693bba6354b3482a03ba58143e7.tar.zst PeerTube-2b621ac0ebe83693bba6354b3482a03ba58143e7.zip | |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'support')
| -rwxr-xr-x | support/docker/production/entrypoint.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/docker/production/entrypoint.sh b/support/docker/production/entrypoint.sh index 261055e84..9f1e8f38f 100755 --- a/support/docker/production/entrypoint.sh +++ b/support/docker/production/entrypoint.sh | |||
| @@ -7,11 +7,11 @@ find /config ! -user peertube -exec chown peertube:peertube {} \; || true | |||
| 7 | # first arg is `-f` or `--some-option` | 7 | # first arg is `-f` or `--some-option` |
| 8 | # or first arg is `something.conf` | 8 | # or first arg is `something.conf` |
| 9 | if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then | 9 | if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then |
| 10 | set -- npm "$@" | 10 | set -- node "$@" |
| 11 | fi | 11 | fi |
| 12 | 12 | ||
| 13 | # allow the container to be started with `--user` | 13 | # allow the container to be started with `--user` |
| 14 | if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then | 14 | if [ "$1" = 'node' -a "$(id -u)" = '0' ]; then |
| 15 | find /data ! -user peertube -exec chown peertube:peertube {} \; | 15 | find /data ! -user peertube -exec chown peertube:peertube {} \; |
| 16 | exec gosu peertube "$0" "$@" | 16 | exec gosu peertube "$0" "$@" |
| 17 | fi | 17 | fi |