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
2c31308077
@ -3,7 +3,6 @@ pipeline:
|
||||
image: docker
|
||||
commands:
|
||||
# Grab the current version, prevents race conditions
|
||||
#### Pass this into the Dockerfile somehow?
|
||||
- apk add --no-cache openssl jq
|
||||
- wget -qO- https://adam-ant.co.uk/plex/pass-version.php | tee /dev/stderr | jq -r .release > .plex_version
|
||||
|
||||
@ -12,7 +11,7 @@ pipeline:
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
commands:
|
||||
- docker build --no-cache --pull -t ppass-dev .
|
||||
- docker build --no-cache --pull --build-arg PLEX_VER="$(cat .plex_version)" -t ppass-dev .
|
||||
|
||||
test:
|
||||
image: docker
|
||||
|
@ -6,14 +6,19 @@ ADD start_pms /usr/sbin/start_pms
|
||||
|
||||
WORKDIR /tmp
|
||||
|
||||
RUN wget http://ftp.de.debian.org/debian/pool/main/g/gcc-6/libstdc++6_6.3.0-18_amd64.deb \
|
||||
ARG PLEX_VER
|
||||
|
||||
RUN set -ax \
|
||||
&& wget http://ftp.de.debian.org/debian/pool/main/g/gcc-6/libstdc++6_6.3.0-18_amd64.deb \
|
||||
&& wget http://ftp.de.debian.org/debian/pool/main/g/gcc-6/libgcc1_6.3.0-18_amd64.deb \
|
||||
&& dpkg-deb -x libstdc++6*.deb . \
|
||||
&& dpkg-deb -x libgcc1*.deb . \
|
||||
# We only need the lib files, everything else is debian junk.
|
||||
&& mv /tmp/usr/lib/x86_64-linux-gnu/* /lib \
|
||||
&& mv /tmp/lib/x86_64-linux-gnu/* /lib \
|
||||
&& export PLEX_VER=$(wget -qO- https://adam-ant.co.uk/plex/pass-version.php | sed -n 's/.*"release":\s*"\([^"]*\)".*/\1/p') \
|
||||
&& if [ -z "$PLEX_VER" ]; then \
|
||||
export PLEX_VER=$(wget -qO- https://adam-ant.co.uk/plex/pass-version.php | sed -n 's/.*"release":\s*"\([^"]*\)".*/\1/p'); \
|
||||
fi \
|
||||
&& wget -O plexmediaserver.deb "https://downloads.plex.tv/plex-media-server/$PLEX_VER/plexmediaserver_"$PLEX_VER"_amd64.deb" \
|
||||
&& dpkg-deb -x plexmediaserver.deb . \
|
||||
# Move usr/lib/plexmediaserver. Everything else is useless
|
||||
|
Loading…
Reference in New Issue
Block a user