From 96604f6e17747a1e950507e9c02e99387577dfc7 Mon Sep 17 00:00:00 2001 From: Adam Dodman Date: Mon, 17 Jul 2017 18:51:46 +0100 Subject: [PATCH] Fix for version page now being JSON --- .drone.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index b1f805a..96a7770 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,8 +8,8 @@ pipeline: image: docker commands: # Grab the current version, prevents race conditions #### Pass this into the Dockerfile somehow? - - apk add --no-cache openssl - - wget -qO- https://adam-ant.co.uk/plex/version.php > .plex_version + - apk add --no-cache openssl jq + - wget -qO- https://adam-ant.co.uk/plex/version.php | jq -r .release> .plex_version build: image: docker diff --git a/Dockerfile b/Dockerfile index e167464..06c3c36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN wget http://ftp.de.debian.org/debian/pool/main/g/gcc-4.9/libstdc++6_4.9.2-10 # 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/version.php) \ + && export PLEX_VER=$(wget -qO- https://adam-ant.co.uk/plex/version.php | sed -n 's/.*"release":\s*"\([^"]*\)".*/\1/p') \ && 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 and start_pms. Everything else is useless