spritsail/plex-test
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into pass

Browse Source
This commit is contained in:
Joe Groocock 2017-08-27 16:51:29 +01:00
commit f0e0552053
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.drone.yml
View File

@ -7,21 +7,22 @@ pipeline:
identify: identify:
image: docker image: docker
commands: commands:
# Grab the current version, prevents race conditions #### Pass this into the Dockerfile somehow? # Grab the current version, prevents race conditions
- apk add --no-cache openssl jq #### Pass this into the Dockerfile somehow?
- wget -qO- https://adam-ant.co.uk/plex/pass-version.php | jq -r .release> .plex_version - 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: build:
image: docker image: docker
environment: environment:
- DOCKER_HOST=tcp://docker:2375 - DOCKER_HOST=tcp://docker:2375
commands: commands:
- docker build -t devbuild . - docker build -t devbuild .
test: test:
image: docker image: docker
environment: environment:
- DOCKER_HOST=tcp://docker:2375 - DOCKER_HOST=tcp://docker:2375
commands: commands:
- apk add --no-cache curl xmlstarlet grep - apk add --no-cache curl xmlstarlet grep
- export CUR_VERSION="$(cat .plex_version)" - export CUR_VERSION="$(cat .plex_version)"
@ -29,7 +30,7 @@ pipeline:
- sleep 25 # Wait for plex to start! - sleep 25 # Wait for plex to start!
- docker logs DEV - docker logs DEV
- curl -sSL docker:32400/identity | tee /dev/stderr | xmlstarlet sel -t -v "/MediaContainer/@version" | grep -qw $CUR_VERSION - 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: publish:
image: docker image: docker
@ -37,7 +38,7 @@ pipeline:
environment: environment:
- DOCKER_HOST=tcp://docker:2375 - DOCKER_HOST=tcp://docker:2375
commands: 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 ) - export CUR_VERSION=$(cat .plex_version | cut -d \- -f1 )
- echo $CUR_VERSION - echo $CUR_VERSION
- echo $DOCKER_USER - echo $DOCKER_USER

2
Dockerfile
View File

@ -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') \ && 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" \ && wget -O plexmediaserver.deb "https://downloads.plex.tv/plex-media-server/$PLEX_VER/plexmediaserver_"$PLEX_VER"_amd64.deb" \
&& dpkg-deb -x plexmediaserver.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 \ && mv usr/lib/plexmediaserver /usr/lib \
&& chmod +x /usr/sbin/start_pms \ && chmod +x /usr/sbin/start_pms \
&& find /tmp -mindepth 1 -delete && find /tmp -mindepth 1 -delete

2
start_pms
View File

@ -42,4 +42,6 @@ if [ -f "$PIDFILE" ]; then
rm -f "$PIDFILE" rm -f "$PIDFILE"
fi 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 $UID:$GID "$PLEX_MEDIA_SERVER_HOME/Plex Media Server"