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

.drone.yml

@@ -4,18 +4,12 @@ pipeline:
     volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
     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:
     image: docker
     volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
     commands:
       - 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)
       - timeout -t 15 docker logs $$CON_NAME &
       - sleep 10  # Wait for plex to start!
@@ -35,7 +29,7 @@ pipeline:
     repo: spritsail/plex-media-server
     tags:
       - 'plexpass'
-      - '%fileauto: %prefix: plexpass% .plex_tag'
+      - '%labelauto: %prefix: plexpass% io.spritsail.version.plex'
 
   notify:
     image: spritsail/notify