From f6c78d363561dca1dc3b708d99013e26c6166948 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 13 Sep 2017 21:50:49 +0100 Subject: [PATCH 1/7] Revert "Rebuild plexpass after a successful public release" This reverts commit e1505bd3651848aa40a65de3b358f9d2647b0ea5. --- .drone.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5173061..3f7a0d6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,16 +46,3 @@ pipeline: - docker login -u $DOCKER_USER -p $DOCKER_PASS - docker push adamant/plexmediaserver - echo "CONGRATS! SUCCESSFULLY BUILT PLEX VERSION $CUR_VERSION" - - downstream: - image: plugins/downstream - secrets: [ DOWNSTREAM_TOKEN ] - server: https://drone.adam-ant.co.uk - fork: true - repositories: - # A public release potentially means an - # updated plexpass release - update that too! - - Adam-Ant/docker-plex-tiny@pass - when: - event: [ push, tag, deployment ] - status: [ success ] From ddc73340e27355a32a7ca9cf31caedca429e6221 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 13 Sep 2017 22:15:50 +0100 Subject: [PATCH 2/7] Only publish images when pushed/deployed --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 3f7a0d6..06a8d1b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,3 +46,5 @@ pipeline: - docker login -u $DOCKER_USER -p $DOCKER_PASS - docker push adamant/plexmediaserver - echo "CONGRATS! SUCCESSFULLY BUILT PLEX VERSION $CUR_VERSION" + when: + event: [ push, tag, deployment ] From 621e44a59a1be9da064a426ceb70fa15fd0aafc7 Mon Sep 17 00:00:00 2001 From: Adam Dodman Date: Wed, 13 Sep 2017 23:15:56 +0100 Subject: [PATCH 3/7] Add drone conditionals, fixes pull requests --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 06a8d1b..c664e88 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,6 +34,8 @@ pipeline: publish: image: docker + when: + event: [push, tag, deployment] secrets: [ DOCKER_USER, DOCKER_PASS ] environment: - DOCKER_HOST=tcp://docker:2375 From a36dce1cbfbb06c05e0651042cfcf65feeaa18c0 Mon Sep 17 00:00:00 2001 From: Adam Dodman Date: Fri, 15 Sep 2017 17:38:08 +0100 Subject: [PATCH 4/7] Update to Docker Sock passthru. Increases performance --- .drone.yml | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index c664e88..03dc608 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,8 +1,3 @@ -services: - docker: - image: docker:dind - privileged: true - pipeline: identify: image: docker @@ -14,39 +9,38 @@ pipeline: build: image: docker - environment: - - DOCKER_HOST=tcp://docker:2375 + volumes: + - /var/run/docker.sock:/var/run/docker.sock commands: - - docker build -t devbuild . + - docker build --no-cache --pull -t plex-dev . test: image: docker - environment: - - DOCKER_HOST=tcp://docker:2375 + volumes: + - /var/run/docker.sock:/var/run/docker.sock commands: - apk add --no-cache curl xmlstarlet grep - export CUR_VERSION="$(cat .plex_version)" - - docker run --name=DEV -d -p 32400:32400 devbuild + - CON_NAME=$(docker run --rm -d -p 32400:32400 plex-dev) - sleep 10 # Wait for plex to start! - - docker logs DEV - - curl -sSL docker:32400/identity | tee /dev/stderr | xmlstarlet sel -t -v "/MediaContainer/@version" | grep -qw $CUR_VERSION - - docker kill DEV # Not really needed, but keeps things quick + - docker logs $$CON_NAME + - curl -sSL $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $$CON_NAME):32400/identity | tee /dev/stderr | xmlstarlet sel -t -v "/MediaContainer/@version" | grep -qw $CUR_VERSION + - docker kill $$CON_NAME # Not really needed, but keeps things quick publish: image: docker when: event: [push, tag, deployment] secrets: [ DOCKER_USER, DOCKER_PASS ] - environment: - - DOCKER_HOST=tcp://docker:2375 + volumes: + - /var/run/docker.sock:/var/run/docker.sock commands: # Grab just the version, not the hash. Used for tagging - export CUR_VERSION=$(cat .plex_version | cut -d \- -f1 ) - echo $DOCKER_USER - - docker tag devbuild adamant/plexmediaserver:latest - - docker tag devbuild adamant/plexmediaserver:$CUR_VERSION + - docker tag plex-dev adamant/plexmediaserver:latest + - docker tag plex-dev adamant/plexmediaserver:$CUR_VERSION - docker login -u $DOCKER_USER -p $DOCKER_PASS - docker push adamant/plexmediaserver + - docker rmi adamant/plexmediaserver plex-dev - echo "CONGRATS! SUCCESSFULLY BUILT PLEX VERSION $CUR_VERSION" - when: - event: [ push, tag, deployment ] From d1693a6e7bf694757210834e420fffcb24300c53 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 19 Sep 2017 23:14:48 +0100 Subject: [PATCH 5/7] Bump libstdc++ and libgcc1 library versions --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c0e801..14870b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ADD start_pms /usr/sbin/start_pms WORKDIR /tmp -RUN wget http://ftp.de.debian.org/debian/pool/main/g/gcc-4.9/libstdc++6_4.9.2-10_amd64.deb \ - && wget http://ftp.de.debian.org/debian/pool/main/g/gcc-4.9/libgcc1_4.9.2-10_amd64.deb \ +RUN wget http://ftp.de.debian.org/debian/pool/main/g/gcc-6/libstdc++6_6.3.0-18_amd64.deb \ + && wget http://ftp.de.debian.org/debian/pool/main/g/gcc-6/libgcc1_6.3.0-18_amd64.deb \ && dpkg-deb -x libstdc++6*.deb . \ && dpkg-deb -x libgcc1*.deb . \ # We only need the lib files, everything else is debian junk. From 0048180ff5ea476c9d2cf68427eba7f617ae5ce0 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 19 Sep 2017 23:26:58 +0100 Subject: [PATCH 6/7] Split large line in test step for readability [CI SKIP] --- .drone.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 03dc608..ccb8130 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,10 @@ pipeline: - CON_NAME=$(docker run --rm -d -p 32400:32400 plex-dev) - sleep 10 # Wait for plex to start! - docker logs $$CON_NAME - - curl -sSL $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $$CON_NAME):32400/identity | tee /dev/stderr | xmlstarlet sel -t -v "/MediaContainer/@version" | grep -qw $CUR_VERSION + - curl -sSL $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $$CON_NAME):32400/identity \ + | tee /dev/stderr \ + | xmlstarlet sel -t -v "/MediaContainer/@version" \ + | grep -qw $CUR_VERSION - docker kill $$CON_NAME # Not really needed, but keeps things quick publish: From 59c06720107db229a2c3ad0839a59b37a0cb54cf Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 19 Sep 2017 23:27:14 +0100 Subject: [PATCH 7/7] Don't bind a port on the host, it's not required --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ccb8130..1d7b06a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,7 @@ pipeline: commands: - apk add --no-cache curl xmlstarlet grep - export CUR_VERSION="$(cat .plex_version)" - - CON_NAME=$(docker run --rm -d -p 32400:32400 plex-dev) + - CON_NAME=$(docker run --rm -d plex-dev) - sleep 10 # Wait for plex to start! - docker logs $$CON_NAME - curl -sSL $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $$CON_NAME):32400/identity \