From f2e26b3ea2d9b891c18b262ec8341a1d84efc34f Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Fri, 7 Sep 2018 10:35:21 +0100 Subject: [PATCH 1/2] rebase to ubuntu bionic, add udev package --- Dockerfile | 11 ++++++----- README.md | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b928e04..f29e643 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM lsiobase/ubuntu:xenial +FROM lsiobase/ubuntu:bionic # set version label ARG BUILD_DATE ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="stian larsen,sparklyballs" +LABEL maintainer="sparklyballs" # global environment settings ENV DEBIAN_FRONTEND="noninteractive" \ @@ -17,19 +17,20 @@ PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ PLEX_MEDIA_SERVER_USER=abc RUN \ - echo "**** install packages ****" && \ + echo "**** install runtime packages ****" && \ apt-get update && \ apt-get install -y \ avahi-daemon \ dbus \ + udev \ unrar \ wget && \ echo "**** install plex ****" && \ curl -o \ - /tmp/plexmediaserver.deb -L \ + /tmp/plexmediaserver.deb -L \ "${PLEX_INSTALL}" && \ dpkg -i /tmp/plexmediaserver.deb && \ - echo "**** change abc home folder to fix plex hanging at runtime with usermod ****" && \ + echo "**** ensure abc user's home folder is /app ****" && \ usermod -d /app abc && \ echo "**** cleanup ****" && \ apt-get clean && \ diff --git a/README.md b/README.md index b6c4e90..cc27f27 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ To upgrade to the latest version (see setting up application section) : `docker ## Versions ++ **07.09.18:** Rebase to ubuntu bionic, add udev package. + **09.12.17:** Fix continuation lines. + **12.07.17:** Add inspect commands to README, move to jenkins build and push. + **28.05.17:** Add unrar package as per requests, for subzero plugin. From 44b6bd2fb12f086aafab6df348ea1fe8a0a2037e Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Fri, 7 Sep 2018 10:41:40 +0100 Subject: [PATCH 2/2] linting fix --- root/etc/cont-init.d/50-plex-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-plex-update b/root/etc/cont-init.d/50-plex-update index 1832953..5bb3f6b 100644 --- a/root/etc/cont-init.d/50-plex-update +++ b/root/etc/cont-init.d/50-plex-update @@ -40,7 +40,7 @@ cat > "${UPGRADE_FAIL}" <<-EOFFAIL EOFFAIL # test for no version set or opt out for autoupdates -if [[ -z "$VERSION" ]] || [[ "$VERSION" == "0" ]] || [[ ! -z "$ADVANCED_DISABLEUPDATES" ]]; then +if [[ -z "$VERSION" ]] || [[ "$VERSION" == "0" ]] || [[ -n "$ADVANCED_DISABLEUPDATES" ]]; then printf '\n\n\n%s\n\n\n' "$(