forks/peertube
1
0
Fork 0
Code Releases Activity

Merge branch 'release/4.2.0' into develop

Browse source
This commit is contained in:
Chocobozzz 2022-06-21 09:03:20 +02:00
commit 2b621ac0eb
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

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

2
server/models/video/video-playlist-element.ts
View file

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

4
support/docker/production/entrypoint.sh
View file

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