Merge remote-tracking branch 'origin/master' into pass

This commit is contained in:
Joe Groocock 2018-07-29 12:09:10 +01:00
commit 73deaea454

View File

@ -4,18 +4,12 @@ pipeline:
volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ] volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
repo: ppass-dev repo: ppass-dev
tag:
image: docker
volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
commands:
- docker inspect -f '{{ index .Config.Labels "io.spritsail.version.plex" }}' ppass-dev | cut -d- -f1 > .plex_tag
test: test:
image: docker image: docker
volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ] volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
commands: commands:
- apk add --no-cache curl xmlstarlet grep - apk add --no-cache curl xmlstarlet grep
- export CUR_VERSION="$(cat .plex_tag)" - export CUR_VERSION="$(docker inspect -f '{{ index .Config.Labels "io.spritsail.version.plex" }}' ppass-dev | cut -d- -f1)"
- CON_NAME=$(docker run --rm -d ppass-dev) - CON_NAME=$(docker run --rm -d ppass-dev)
- timeout -t 15 docker logs $$CON_NAME & - timeout -t 15 docker logs $$CON_NAME &
- sleep 10 # Wait for plex to start! - sleep 10 # Wait for plex to start!
@ -35,7 +29,7 @@ pipeline:
repo: spritsail/plex-media-server repo: spritsail/plex-media-server
tags: tags:
- 'plexpass' - 'plexpass'
- '%fileauto: %prefix: plexpass% .plex_tag' - '%labelauto: %prefix: plexpass% io.spritsail.version.plex'
notify: notify:
image: spritsail/notify image: spritsail/notify