From 55e1964bf0a7242c45563dd1e14a13c368e6d818 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Wed, 11 Jan 2017 21:26:14 +0000 Subject: [PATCH] save up --- Dockerfile | 1 + root/etc/cont-init.d/40-chown-files | 1 - root/etc/cont-init.d/50-plex-update | 7 ------- root/etc/services.d/avahi/run | 1 - root/etc/services.d/dbus/run | 1 - root/etc/services.d/plex/run | 2 -- 6 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index d74ef3b..bf0cb02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="/config/Library/Application Support" PLEX_MEDIA_SERVER_HOME="/usr/lib/plexmediaserver" \ PLEX_MEDIA_SERVER_INFO_DEVICE=docker \ PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \ +PLEX_MEDIA_SERVER_USER=abc \ LD_LIBRARY_PATH="/usr/lib/plexmediaserver:$LD_LIBRARY_PATH" # install packages diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/cont-init.d/40-chown-files index 6726d97..509665a 100644 --- a/root/etc/cont-init.d/40-chown-files +++ b/root/etc/cont-init.d/40-chown-files @@ -14,4 +14,3 @@ if [ ! "$(stat -c %u /config/Library)" = "$PUID" ]; then chown abc:abc -R \ /config/Library fi - diff --git a/root/etc/cont-init.d/50-plex-update b/root/etc/cont-init.d/50-plex-update index 2c181db..75174af 100644 --- a/root/etc/cont-init.d/50-plex-update +++ b/root/etc/cont-init.d/50-plex-update @@ -1,9 +1,5 @@ #!/usr/bin/with-contenv bash -# copy config on first run, regardless of update status -[[ ! -e /etc/default/plexmediaserver ]] && \ - cp /defaults/plexmediaserver /etc/default/plexmediaserver - # test if plex is installed and try re-pulling latest if not if (dpkg --get-selections plexmediaserver | grep -wq "install"); then : @@ -117,6 +113,3 @@ else dpkg -i --force-confold /tmp/plexmediaserver_"${REMOTE_VERSION}"_amd64.deb rm -f /tmp/plexmediaserver_*.deb fi - -# recopy config file -cp /defaults/plexmediaserver /etc/default/plexmediaserver diff --git a/root/etc/services.d/avahi/run b/root/etc/services.d/avahi/run index 41851f1..e438886 100644 --- a/root/etc/services.d/avahi/run +++ b/root/etc/services.d/avahi/run @@ -6,4 +6,3 @@ done echo "Starting Avahi daemon" exec avahi-daemon --no-chroot - diff --git a/root/etc/services.d/dbus/run b/root/etc/services.d/dbus/run index e2a078f..8f81ef1 100644 --- a/root/etc/services.d/dbus/run +++ b/root/etc/services.d/dbus/run @@ -2,4 +2,3 @@ echo "Starting dbus-daemon" exec dbus-daemon --system --nofork - diff --git a/root/etc/services.d/plex/run b/root/etc/services.d/plex/run index cd91d22..947921d 100644 --- a/root/etc/services.d/plex/run +++ b/root/etc/services.d/plex/run @@ -4,5 +4,3 @@ echo "Starting Plex Media Server." exec \ s6-setuidgid abc /bin/bash -c \ '/usr/lib/plexmediaserver/Plex\ Media\ Server' - -