Merge branch 'master' into pass

This commit is contained in:
Joe Groocock 2017-09-19 23:42:50 +01:00
commit 9245ceb445
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
2 changed files with 7 additions and 4 deletions

View File

@ -21,10 +21,13 @@ pipeline:
commands: commands:
- apk add --no-cache curl xmlstarlet grep - apk add --no-cache curl xmlstarlet grep
- export CUR_VERSION="$(cat .plex_version)" - export CUR_VERSION="$(cat .plex_version)"
- CON_NAME=$(docker run --rm -d -p 32400:32400 ppass-dev) - CON_NAME=$(docker run --rm -d ppass-dev)
- sleep 25 # Wait for plex to start! - sleep 25 # Wait for plex to start!
- docker logs $$CON_NAME - docker logs $$CON_NAME
- curl -sSL $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $$CON_NAME):32400/identity | tee /dev/stderr | xmlstarlet sel -t -v "/MediaContainer/@version" | grep -qw $CUR_VERSION - curl -sSL $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $$CON_NAME):32400/identity \
| tee /dev/stderr \
| xmlstarlet sel -t -v "/MediaContainer/@version" \
| grep -qw $CUR_VERSION
- docker kill $$CON_NAME # Not really needed, but keeps things quick - docker kill $$CON_NAME # Not really needed, but keeps things quick
publish: publish:

View File

@ -6,8 +6,8 @@ ADD start_pms /usr/sbin/start_pms
WORKDIR /tmp WORKDIR /tmp
RUN wget http://ftp.de.debian.org/debian/pool/main/g/gcc-4.9/libstdc++6_4.9.2-10_amd64.deb \ RUN 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-4.9/libgcc1_4.9.2-10_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 libstdc++6*.deb . \
&& dpkg-deb -x libgcc1*.deb . \ && dpkg-deb -x libgcc1*.deb . \
# We only need the lib files, everything else is debian junk. # We only need the lib files, everything else is debian junk.