Merge branch 'master' into pass

This commit is contained in:
Joe Groocock 2017-12-15 16:49:34 +00:00
commit b3e5e7009b
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86

View File

@ -21,13 +21,13 @@ pipeline:
- 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 ppass-dev) - CON_NAME=$(docker run --rm -d ppass-dev)
- timeout -t 30 docker logs $$CON_NAME &
- sleep 25 # Wait for plex to start! - sleep 25 # Wait for plex to start!
- docker logs $$CON_NAME
- curl -sSL $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $$CON_NAME):32400/identity - curl -sSL $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $$CON_NAME):32400/identity
| tee /dev/stderr | tee /dev/stderr
| xmlstarlet sel -t -v "/MediaContainer/@version" | xmlstarlet sel -t -v "/MediaContainer/@version"
| grep -qw $CUR_VERSION | grep -qw $CUR_VERSION
- docker kill $$CON_NAME # Not really needed, but keeps things quick - docker kill $$CON_NAME
publish: publish:
image: docker image: docker