diff --git a/Dockerfile b/Dockerfile index 6e10e3e..cf066ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM lsiobase/xenial MAINTAINER Stian Larsen, sparklyballs # global environment settings @@ -6,30 +6,13 @@ ENV DEBIAN_FRONTEND="noninteractive" ENV HOME="/config" ENV TERM="xterm" -# add abc user and make folders -RUN \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ - mkdir -p \ - /config - # install packages RUN \ apt-get update && \ - apt-get install -y \ - apt-utils && \ apt-get install -y \ avahi-daemon \ - curl \ dbus \ wget && \ - -# add s6 overlay - curl -o \ - /tmp/s6.tar.gz -L \ - https://github.com/just-containers/s6-overlay/releases/download/v1.17.2.0/s6-overlay-amd64.tar.gz && \ - tar xvf /tmp/s6.tar.gz -C / && \ - # cleanup apt-get clean && \ rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* @@ -42,9 +25,6 @@ RUN \ dpkg -i /tmp/plexmediaserver.deb && \ rm -f /tmp/plexmediaserver.deb - -ENTRYPOINT ["/init"] - # add local files COPY root/ / diff --git a/root/etc/cont-init.d/10_add_user b/root/etc/cont-init.d/10_add_user deleted file mode 100644 index b76f8ff..0000000 --- a/root/etc/cont-init.d/10_add_user +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/with-contenv bash - - - -PUID=${PUID:-911} -PGID=${PGID:-911} - -if [ ! "$(id -u abc)" -eq "$PUID" ]; then usermod -o -u "$PUID" abc ; fi -if [ ! "$(id -g abc)" -eq "$PGID" ]; then groupmod -o -g "$PGID" abc ; fi - -echo " -------------------------------------- - _ _ _ - | |___| (_) ___ - | / __| | |/ _ \ - | \__ \ | | (_) | - |_|___/ |_|\___/ - |_| - -Brought to you by linuxserver.io -We do accept donations at: -https://www.linuxserver.io/donations -------------------------------------- -GID/UID -------------------------------------- -User uid: $(id -u abc) -User gid: $(id -g abc) -------------------------------------- -" -chown abc:abc /config -chown abc:abc /defaults