diff --git a/plex/Dockerfile b/plex/Dockerfile index f274cfbf4..6b658bcb2 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -32,30 +32,30 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=SC2016 RUN \ - ############################# - # Allow UID and GID setting # - ############################# - \ - grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ - \ - # Prevent changing ownership of /config - && grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \ - \ - # Allow UID and GID setting - && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \ - sed -i 's/bash/bashio/g' "$file" && \ - sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \ - sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \ - && sed -i "s|chown abc:abc /config||g" /etc/cont-init.d/10-adduser \ \ ###################### # CORRECT PLEX CLAIM # ###################### \ - && sed -i 's/with-contenv bash/with-contenv bashio/g' /etc/cont-init.d/45-plex-claim \ + sed -i 's/with-contenv bash/with-contenv bashio/g' /etc/cont-init.d/45-plex-claim \ && sed -i '2iexport PLEX_CLAIM=$(bashio::config "claim")' /etc/cont-init.d/45-plex-claim \ && sed -i '3i[ $PLEX_CLAIM = "Get_from_https://www.plex.tv/claim" ] && bashio::log.warning "Please change the PLEX_CLAIM code from the options" && exit 1 || true' /etc/cont-init.d/45-plex-claim +# GLOBAL LSIO MODIFICATIONS +# hadolint ignore=SC2015 +ARG CONFIGLOCATION="/config" +RUN \ + # Avoid custom-init.d duplications + rm -f $(grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d) \ + \ + # change config folder + && sed -i "s=/config=$CONFIGLOCATION || true=g" $(grep -sril '/config[ /$]' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d) \ + \ + # Allow UID and GID setting + && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \ + sed -i 's/bash/bashio/g' "$file" && \ + sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \ + sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done ################## # 3 Install apps #