mirror of
https://github.com/spritsail/plex-media-server.git
synced 2024-12-20 11:34:36 +00:00
Merge branch 'master' into pass
This commit is contained in:
commit
f0e0552053
@ -7,9 +7,10 @@ pipeline:
|
|||||||
identify:
|
identify:
|
||||||
image: docker
|
image: docker
|
||||||
commands:
|
commands:
|
||||||
# Grab the current version, prevents race conditions #### Pass this into the Dockerfile somehow?
|
# Grab the current version, prevents race conditions
|
||||||
|
#### Pass this into the Dockerfile somehow?
|
||||||
- apk add --no-cache openssl jq
|
- apk add --no-cache openssl jq
|
||||||
- wget -qO- https://adam-ant.co.uk/plex/pass-version.php | jq -r .release> .plex_version
|
- wget -qO- https://adam-ant.co.uk/plex/pass-version.php | tee /dev/stderr | jq -r .release > .plex_version
|
||||||
|
|
||||||
build:
|
build:
|
||||||
image: docker
|
image: docker
|
||||||
|
@ -16,7 +16,7 @@ RUN wget http://ftp.de.debian.org/debian/pool/main/g/gcc-4.9/libstdc++6_4.9.2-10
|
|||||||
&& export PLEX_VER=$(wget -qO- https://adam-ant.co.uk/plex/pass-version.php | sed -n 's/.*"release":\s*"\([^"]*\)".*/\1/p') \
|
&& export PLEX_VER=$(wget -qO- https://adam-ant.co.uk/plex/pass-version.php | sed -n 's/.*"release":\s*"\([^"]*\)".*/\1/p') \
|
||||||
&& wget -O plexmediaserver.deb "https://downloads.plex.tv/plex-media-server/$PLEX_VER/plexmediaserver_"$PLEX_VER"_amd64.deb" \
|
&& wget -O plexmediaserver.deb "https://downloads.plex.tv/plex-media-server/$PLEX_VER/plexmediaserver_"$PLEX_VER"_amd64.deb" \
|
||||||
&& dpkg-deb -x plexmediaserver.deb . \
|
&& dpkg-deb -x plexmediaserver.deb . \
|
||||||
# Move usr/lib and start_pms. Everything else is useless
|
# Move usr/lib/plexmediaserver. Everything else is useless
|
||||||
&& mv usr/lib/plexmediaserver /usr/lib \
|
&& mv usr/lib/plexmediaserver /usr/lib \
|
||||||
&& chmod +x /usr/sbin/start_pms \
|
&& chmod +x /usr/sbin/start_pms \
|
||||||
&& find /tmp -mindepth 1 -delete
|
&& find /tmp -mindepth 1 -delete
|
||||||
|
@ -42,4 +42,6 @@ if [ -f "$PIDFILE" ]; then
|
|||||||
rm -f "$PIDFILE"
|
rm -f "$PIDFILE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
tail -F "$PLEX_MEDIA_SERVER_CONFIG_DIR/Logs/Plex Media Server.log" >/proc/1/fd/1 2>/dev/null &
|
||||||
|
|
||||||
exec su-exec $UID:$GID "$PLEX_MEDIA_SERVER_HOME/Plex Media Server"
|
exec su-exec $UID:$GID "$PLEX_MEDIA_SERVER_HOME/Plex Media Server"
|
||||||
|
Loading…
Reference in New Issue
Block a user