aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md2
-rw-r--r--server/models/video/video-playlist-element.ts2
-rwxr-xr-xsupport/docker/production/entrypoint.sh4
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9236e46b..2b0535b7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@
22 * Fix incorrect instance stats 22 * Fix incorrect instance stats
23 * Fix broken player on ICE error 23 * Fix broken player on ICE error
24 * Relax views federation 24 * Relax views federation
25 * Fix peertube user in docker
26 * Fix playlist element federation with a deleted video
25 27
26 28
27## v4.2.0 29## v4.2.0
diff --git a/server/models/video/video-playlist-element.ts b/server/models/video/video-playlist-element.ts
index 4e4160818..b45f15bd6 100644
--- a/server/models/video/video-playlist-element.ts
+++ b/server/models/video/video-playlist-element.ts
@@ -351,7 +351,7 @@ export class VideoPlaylistElementModel extends Model<Partial<AttributesOnly<Vide
351 id: this.url, 351 id: this.url,
352 type: 'PlaylistElement', 352 type: 'PlaylistElement',
353 353
354 url: this.Video.url, 354 url: this.Video?.url || null,
355 position: this.position 355 position: this.position
356 } 356 }
357 357
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`
9if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then 9if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
10 set -- npm "$@" 10 set -- node "$@"
11fi 11fi
12 12
13# allow the container to be started with `--user` 13# allow the container to be started with `--user`
14if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then 14if [ "$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" "$@"
17fi 17fi