Merge branch 'release/4.2.0' into develop

CHANGELOG.md

@@ -22,6 +22,8 @@
  * Fix incorrect instance stats
  * Fix broken player on ICE error
  * Relax views federation
+ * Fix peertube user in docker
+ * Fix playlist element federation with a deleted video
 
 
 ## v4.2.0

server/models/video/video-playlist-element.ts

@@ -351,7 +351,7 @@ export class VideoPlaylistElementModel extends Model<Partial<AttributesOnly<Vide
       id: this.url,
       type: 'PlaylistElement',
 
-      url: this.Video.url,
+      url: this.Video?.url || null,
       position: this.position
     }
 

support/docker/production/entrypoint.sh

@@ -7,11 +7,11 @@ find /config ! -user peertube -exec chown peertube:peertube {} \; || true
 # first arg is `-f` or `--some-option`
 # or first arg is `something.conf`
 if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
-    set -- npm "$@"
+    set -- node "$@"
 fi
 
 # allow the container to be started with `--user`
-if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then
+if [ "$1" = 'node' -a "$(id -u)" = '0' ]; then
     find /data ! -user peertube -exec  chown peertube:peertube {} \;
     exec gosu peertube "$0" "$@"
 fi