From b751dce8a5776d872ec485aab6758fd6247e2dae Mon Sep 17 00:00:00 2001 From: Adam Dodman Date: Sun, 9 Jul 2017 21:53:15 +0100 Subject: [PATCH] Update Pass branch --- .drone.yml | 9 +++++---- Dockerfile | 2 +- README.md | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 96a7770..4311dd4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ pipeline: commands: # Grab the current version, prevents race conditions #### Pass this into the Dockerfile somehow? - apk add --no-cache openssl jq - - wget -qO- https://adam-ant.co.uk/plex/version.php | jq -r .release> .plex_version + - wget -qO- https://adam-ant.co.uk/plex/pass-version.php | jq -r .release> .plex_version build: image: docker @@ -39,9 +39,10 @@ pipeline: commands: #Grab just the version, not the hash. Used for tagging - export CUR_VERSION=$(cat .plex_version | cut -d \- -f1 ) + - echo $CUR_VERSION - echo $DOCKER_USER - - docker tag devbuild adamant/plexmediaserver:latest - - docker tag devbuild adamant/plexmediaserver:$CUR_VERSION + - docker tag devbuild adamant/plexmediaserver:plexpass + - docker tag devbuild adamant/plexmediaserver:plexpass-$CUR_VERSION - docker login -u $DOCKER_USER -p $DOCKER_PASS - docker push adamant/plexmediaserver - - echo "CONGRATS! SUCCESSFULLY BUILT PLEX VERSION "$CUR_VERSION + - echo "CONGRATS! SUCCESSFULLY BUILT PLEX VERSION $CUR_VERSION-PASS" diff --git a/Dockerfile b/Dockerfile index 06c3c36..4151fc4 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 | sed -n 's/.*"release":\s*"\([^"]*\)".*/\1/p') \ + && export PLEX_VER=$(wget -qO- https://adam-ant.co.uk/plex/pass-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 diff --git a/README.md b/README.md index 3a5b995..c9c3332 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # [adamant/plexmediaserver][hub] -[![](https://images.microbadger.com/badges/image/adamant/plexmediaserver.svg)](https://microbadger.com/images/adamant/plexmediaserver) [![Docker Pulls](https://img.shields.io/docker/pulls/adamant/plexmediaserver.svg)][hub] [![Docker Stars](https://img.shields.io/docker/stars/adamant/plexmediaserver.svg)][hub] [![Build Status](https://drone.adam-ant.co.uk/api/badges/Adam-Ant/docker-plex-tiny/status.svg)](https://drone.adam-ant.co.uk/Adam-Ant/docker-plex-tiny) +[![](https://images.microbadger.com/badges/image/adamant/plexmediaserver:plexpass.svg)](https://microbadger.com/images/adamant/plexmediaserver:plexpass) [![Docker Pulls](https://img.shields.io/docker/pulls/adamant/plexmediaserver.svg)][hub] [![Docker Stars](https://img.shields.io/docker/stars/adamant/plexmediaserver.svg)][hub] [![Build Status](https://drone.adam-ant.co.uk/api/badges/Adam-Ant/docker-plex-tiny/status.svg)](https://drone.adam-ant.co.uk/Adam-Ant/docker-plex-tiny) The smallest* Plex Media Server docker image, built on [busybox](https://hub.docker.com/_/busybox/) with glibc and packages from the debian repos. The container contains a bare minimum glibc dependency tree, with most of the crap removed.