From 2bc01ff2a0fa5027805b46e4e2e10d937fda2002 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 20 Sep 2017 00:11:30 +0100 Subject: [PATCH 1/2] Only publish on master/pass branches --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 32ed4d8..2942e52 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,7 +32,8 @@ pipeline: publish: image: docker when: - event: [push, tag, deployment] + branch: [ master, pass ] + event: [ push, tag, deployment ] secrets: [ DOCKER_USER, DOCKER_PASS ] volumes: - /var/run/docker.sock:/var/run/docker.sock From f6eb4eeefca23148740b9ce0da3060489e639b69 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 20 Sep 2017 00:50:12 +0100 Subject: [PATCH 2/2] Add simple HEALTHCHECK --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index bb0c5b1..c88866c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,8 @@ RUN set -ax \ && chmod +x /usr/sbin/start_pms \ && find /tmp -mindepth 1 -delete +HEALTHCHECK --interval=30s --timeout=12s CMD wget -O /dev/null -T 10 -q localhost:32400/identity || exit 1 + WORKDIR /usr/lib/plexmediaserver ENTRYPOINT ["/sbin/tini", "--"]