diff --git a/.drone.yml b/.drone.yml index f5603fc..7b49f47 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,21 +7,22 @@ pipeline: identify: image: docker 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/pass-version.php | jq -r .release> .plex_version + # 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/pass-version.php | tee /dev/stderr | jq -r .release > .plex_version build: image: docker environment: - - DOCKER_HOST=tcp://docker:2375 + - DOCKER_HOST=tcp://docker:2375 commands: - - docker build -t devbuild . + - docker build -t devbuild . test: image: docker environment: - - DOCKER_HOST=tcp://docker:2375 + - DOCKER_HOST=tcp://docker:2375 commands: - apk add --no-cache curl xmlstarlet grep - export CUR_VERSION="$(cat .plex_version)" @@ -29,7 +30,7 @@ pipeline: - sleep 25 # 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 kill DEV # Not really needed, but keeps things quick publish: image: docker @@ -37,7 +38,7 @@ pipeline: environment: - DOCKER_HOST=tcp://docker:2375 commands: - #Grab just the version, not the hash. Used for tagging + # 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 diff --git a/Dockerfile b/Dockerfile index 4151fc4..b0a02c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN wget http://ftp.de.debian.org/debian/pool/main/g/gcc-4.9/libstdc++6_4.9.2-10 && 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 + # Move usr/lib/plexmediaserver. Everything else is useless && mv usr/lib/plexmediaserver /usr/lib \ && chmod +x /usr/sbin/start_pms \ && find /tmp -mindepth 1 -delete diff --git a/start_pms b/start_pms index 51d3b7f..e278eb6 100644 --- a/start_pms +++ b/start_pms @@ -42,4 +42,6 @@ if [ -f "$PIDFILE" ]; then rm -f "$PIDFILE" 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"