From 6bc657da36fee83a1c58cb16c6bdad8754f65a1d Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sun, 4 Sep 2022 11:17:19 +0200 Subject: [PATCH] v3ify --- bazarr/Dockerfile | 22 +++++++++++----------- booksonic_air/Dockerfile | 12 ++++++------ calibre/Dockerfile | 12 ++++++------ calibre_web/Dockerfile | 12 ++++++------ code-server/Dockerfile | 12 ++++++------ filebrowser/Dockerfile | 1 - flexget/Dockerfile | 12 ++++++------ grav/Dockerfile | 12 ++++++------ jackett/Dockerfile | 12 ++++++------ jellyfin/Dockerfile | 12 ++++++------ lidarr/Dockerfile | 12 ++++++------ mylar3/Dockerfile | 12 ++++++------ nzbget/Dockerfile | 12 ++++++------ ombi/Dockerfile | 12 ++++++------ organizr/Dockerfile | 12 ++++++------ overseerr/Dockerfile | 12 ++++++------ paperless_ngx/Dockerfile | 12 ++++++------ papermerge/Dockerfile | 12 ++++++------ piwigo/Dockerfile | 12 ++++++------ plex/Dockerfile | 12 ++++++------ plex_meta_manager/Dockerfile | 12 ++++++------ prowlarr/Dockerfile | 12 ++++++------ qbittorrent/Dockerfile | 36 ++++++++++++++++++------------------ radarr/Dockerfile | 12 ++++++------ readarr/Dockerfile | 12 ++++++------ requestrr/Dockerfile | 12 ++++++------ resiliosync/Dockerfile | 12 ++++++------ sonarr/Dockerfile | 12 ++++++------ transmission/Dockerfile | 12 ++++++------ webtop_kde/Dockerfile | 12 ++++++------ 30 files changed, 191 insertions(+), 192 deletions(-) diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 29698431d..8481b275f 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -28,22 +28,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +# GLOBAL LSIO MODIFICATIONS +# hadolint ignore=SC2015 +ARG CONFIGLOCATION="/config/addons_config/bazarr" RUN \ - # Correct config folder - grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/bazarr|g' \ - && grep -rl " /config" /etc/services.d | xargs sed -i 's| /config| /config/addons_config/bazarr|g' \ - \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ - # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + # change config folder + && grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs sed -i "s=/config=$CONFIGLOCATION || true=g" \ \ # Allow UID and GID setting - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index ea61af010..dcf9d493e 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -30,16 +30,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ ENV BOOKSONIC_AIR_SETTINGS="/data" RUN \ # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/calibre/Dockerfile b/calibre/Dockerfile index a55b860e7..9da6f5c6f 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -29,16 +29,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Allow UID and GID setting -RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ +RUN grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Change home folder location && sed -i 's|/config|/config/addons_config/calibre|g' /defaults/* \ diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 3d718b908..fbed8dbc8 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -28,16 +28,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ +RUN grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Change home folder location && sed -i 's|/config|/config/addons_config/calibre-web|g' /defaults/* \ diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 060df8c4e..3faf6d6c0 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -29,16 +29,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ RUN \ # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ # MOFIFY DATA PATH && sed -i "s|config|data|g" /etc/services.d/code-server/run \ && sed -i "s|config|data|g" /etc/cont-init.d/30-config diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index b11ba6411..14a60006d 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -27,7 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 - ################## # 3 Install apps # ################## diff --git a/flexget/Dockerfile b/flexget/Dockerfile index a11c845f3..a5f92baf2 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -32,16 +32,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=SC2016 RUN \ # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Correct config folder && grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/flexget|g' \ diff --git a/grav/Dockerfile b/grav/Dockerfile index a9b027619..b09ffeb54 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -33,16 +33,16 @@ RUN \ && sed -i "s|/share/grav/nginx|/config/nginx|g" /etc/cont-init.d/50-config \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/jackett/Dockerfile b/jackett/Dockerfile index a16015e75..196ebd640 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -31,16 +31,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # Changes config directory ENV XDG_CONFIG_HOME="/config/addons_config" diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 816e1e325..a275c752a 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -30,16 +30,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=0 \ # Allow UID and GID setting RUN \ - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index a36094cb8..48a9684cf 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -33,16 +33,16 @@ RUN \ && sed -i "s|/config|/config/addons_config/lidarr|g" /etc/cont-init.d/30-config \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index b4c9579ee..94be3737a 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -31,16 +31,16 @@ RUN sed -i "s|/config|/data|g" /etc/services.d/*/run \ && sed -i "s|/config|/data|g" /etc/cont-init.d/* \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index af7ec0644..ad83a7bdd 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -31,16 +31,16 @@ RUN sed -i "s|/config|/config/addons_config/nzbget|g" /etc/services.d/nzbget/run && sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/30-config \ && sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/10-adduser \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ # Create folder && sed -i '1a mkdir -p /config/addons_config/nzbget' /etc/cont-init.d/10-adduser diff --git a/ombi/Dockerfile b/ombi/Dockerfile index a1d62339c..0c2b2ea6d 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -31,16 +31,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # hadolint ignore=SC2015,DL4006 RUN \ # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Correct config folder && grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/ombi|g' || true \ diff --git a/organizr/Dockerfile b/organizr/Dockerfile index bba80d407..ba4185929 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -32,16 +32,16 @@ RUN \ # Correct upstream image folders links # ######################################## # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Allow custom config folder && grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \ diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 623239fce..b18b27201 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -32,16 +32,16 @@ RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/serv && sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/cont-init.d/30-config \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index e5c3772fb..e04f3140e 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -35,16 +35,16 @@ RUN \ # Correct image # ################# # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ # Change config location && sed -i "s|/config|$PAPERLESS_DATA_DIR|g" /etc/cont-init.d/10-adduser \ && sed -i "s|/config|$PAPERLESS_DATA_DIR|g" /etc/cont-init.d/50-config diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 81a35f1a6..8d35b017a 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -30,16 +30,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # hadolint ignore=SC2015 RUN \ # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ # Change config path && sed -i 's|papermerge/config|papermerge/confi|g' /etc/cont-init.d/* \ && sed -i 's|/config|/data/config|g' /etc/cont-init.d/* \ diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index c20a69fde..9b44dd066 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -29,16 +29,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ RUN \ # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 ################## diff --git a/plex/Dockerfile b/plex/Dockerfile index 5e658ede5..f274cfbf4 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -36,16 +36,16 @@ RUN \ # Allow UID and GID setting # ############################# \ - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ ###################### diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 2bed00559..0314ea354 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -35,16 +35,16 @@ RUN \ && sed -i "s|/config|/config/addons_config/plex-meta-manager|g" /etc/cont-init.d/* \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Add template config.yaml && mkdir /templates \ diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index aeb49f80e..d6c2602f2 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -29,16 +29,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ RUN \ # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Correct permissions && sed -i 's|/config|-R /config/addons_config/prowlarr|g' /etc/cont-init.d/10-adduser \ diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 4bc4c4667..64fd54c20 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -37,32 +37,32 @@ ENV \ S6_CMD_WAIT_FOR_SERVICES=1 \ TERM="xterm-256color" -# hadolint ignore=SC2015 +# SPECIFIC IMAGES MODIFICATIONS RUN \ - # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ - \ - # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ - \ - # Allow UID and GID setting - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ - \ - # Correct permissions - && sed -i 's=/config=/config/qBittorrent || true=g' /etc/cont-init.d/10-adduser \ - && sed -i 's= /config= /config/qBittorrent || true=g' /etc/cont-init.d/30-config \ - \ # Set download folder to /share - && sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \ + sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \ \ # Remove fixed folders, allows connection to webUI && sed '11,13d' /defaults/qBittorrent.conf \ && echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \ && echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf || true +# GLOBAL LSIO MODIFICATIONS +# hadolint ignore=SC2015 +ARG CONFIGLOCATION="/config/qBittorrent" +RUN \ + # Avoid custom-init.d duplications + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ + \ + # change config folder + && grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs sed -i "s=/config=$CONFIGLOCATION || true=g" \ + \ + # 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 # ################## diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 8e116a911..0f4770479 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -33,16 +33,16 @@ RUN \ && sed -i "s|/config|/config/addons_config/radarr|g" /etc/cont-init.d/30-config \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 ################## diff --git a/readarr/Dockerfile b/readarr/Dockerfile index e4044d169..c846cf80e 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -32,16 +32,16 @@ RUN sed -i "s|/config|/config/addons_config/readarr|g" /etc/services.d/readarr/r && sed -i "s|/config|/config/addons_config/readarr|g" /etc/cont-init.d/30-config \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 662f551b0..7bcf2baf3 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -32,16 +32,16 @@ RUN \ sed -i 's|/config \\|/data \\|g' /etc/cont-init.d/30-config \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index e792ea8b3..639d529d7 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -34,16 +34,16 @@ RUN \ # Adapt image # ############### # Avoid custom-init.d duplications - if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Correct config folder && grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /share/resiliosync_config|g' || true \ diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index db0c06b27..a651c00f8 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -34,16 +34,16 @@ RUN \ && sed -i "s|/config|/config/addons_config/sonarr|g" /etc/cont-init.d/30-config \ \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 48f8a5ebf..5543bfc65 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -31,16 +31,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ RUN sed -i "s|config|config/transmission|g" /etc/services.d/transmission/run \ #&& sed -i "s|config|config/transmission|g" /etc/cont-init.d/20-config \ # Avoid custom-init.d duplications - && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ + && grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser + && 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 # diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index d8beeb57b..712f4d27c 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -28,16 +28,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Allow UID and GID setting -RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ +RUN grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ \ # Prevent changing ownership of /config - && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ - && if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \ + && 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 - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \ - && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \ + && 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 \ \ # Change home folder location && sed -i 's|/config|/share/webtop_kde|g' /defaults/* \