From f63d3083bd2ecf15a531b065693d99f27a30a9e4 Mon Sep 17 00:00:00 2001
From: Joe Groocock <frebib@gmail.com>
Date: Fri, 15 Dec 2017 16:37:42 +0000
Subject: [PATCH 1/3] Use inline syntax for healthcheck

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c88866c..8adf7a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ 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
+HEALTHCHECK --interval=30s --timeout=12s CMD [ "wget", "-O", "/dev/null", "-T", "10", "-q", "localhost:32400/identity" ]
 
 WORKDIR /usr/lib/plexmediaserver
 

From b6a19ca7208b8e8d9dea78acccf6d9586bc8243c Mon Sep 17 00:00:00 2001
From: Joe Groocock <frebib@gmail.com>
Date: Fri, 15 Dec 2017 16:43:33 +0000
Subject: [PATCH 2/3] Use updated su-exec options

---
 Dockerfile | 2 +-
 start_pms  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8adf7a1..85fc6c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM adamant/busybox:libressl
 MAINTAINER Adam Dodman <adam.dodman@gmx.com>
 
-ENV UID=900 GID=900
+ENV SUID=900 SGID=900
 ADD start_pms /usr/sbin/start_pms
 
 WORKDIR /tmp
diff --git a/start_pms b/start_pms
index e278eb6..784b390 100644
--- a/start_pms
+++ b/start_pms
@@ -18,7 +18,7 @@ then
     exit 1
   fi
 fi
-if su-exec $UID:$GID [ ! -w "$PLEX_MEDIA_SERVER_CONFIG_DIR" ]
+if su-exec -e [ ! -w "$PLEX_MEDIA_SERVER_CONFIG_DIR" ]
 then
   echo "ERROR: CANNOT WRITE IN $PLEX_MEDIA_SERVER_CONFIG_DIR, MAKE SURE I HAVE PERMISSION TO DO THAT!"
   exit 2
@@ -44,4 +44,4 @@ fi
 
 tail -F "$PLEX_MEDIA_SERVER_CONFIG_DIR/Logs/Plex Media Server.log" >/proc/1/fd/1 2>/dev/null &
 
-exec su-exec $UID:$GID "$PLEX_MEDIA_SERVER_HOME/Plex Media Server"
+exec su-exec -e "$PLEX_MEDIA_SERVER_HOME/Plex Media Server"

From 2b35049cc0a674e9c133554aa94dc86baf7aa120 Mon Sep 17 00:00:00 2001
From: Joe Groocock <frebib@gmail.com>
Date: Fri, 15 Dec 2017 16:48:29 +0000
Subject: [PATCH 3/3] Print logs whilst sleeping in test

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 2942e52..91690d8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -21,13 +21,13 @@ pipeline:
       - apk add --no-cache curl xmlstarlet grep
       - export CUR_VERSION="$(cat .plex_version)"
       - CON_NAME=$(docker run --rm -d plex-dev)
+      - timeout -t 15 docker logs $$CON_NAME &
       - 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
-      - docker kill $$CON_NAME # Not really needed, but keeps things quick
+      - docker kill $$CON_NAME
 
   publish:
     image: docker