From e1741a62c4dcda501124f5ee446b8349b4e9dbd3 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sun, 4 Sep 2022 09:56:34 +0200 Subject: [PATCH] [v3ify] Prevent change ownership of config --- bazarr/Dockerfile | 1 + booksonic_air/Dockerfile | 1 + calibre/Dockerfile | 1 + calibre_web/Dockerfile | 1 + code-server/Dockerfile | 1 + flexget/Dockerfile | 1 + grav/Dockerfile | 1 + jackett/Dockerfile | 1 + jellyfin/Dockerfile | 1 + lidarr/Dockerfile | 1 + mylar3/Dockerfile | 1 + nzbget/Dockerfile | 1 + ombi/Dockerfile | 1 + organizr/Dockerfile | 1 + overseerr/Dockerfile | 1 + paperless_ngx/Dockerfile | 1 + papermerge/Dockerfile | 1 + piwigo/Dockerfile | 1 + plex/Dockerfile | 1 + plex_meta_manager/Dockerfile | 1 + prowlarr/Dockerfile | 1 + qbittorrent/Dockerfile | 1 + radarr/Dockerfile | 1 + readarr/Dockerfile | 1 + requestrr/Dockerfile | 1 + resiliosync/Dockerfile | 1 + sonarr/Dockerfile | 1 + transmission/Dockerfile | 1 + webtop_kde/Dockerfile | 1 + 29 files changed, 29 insertions(+) diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 3ff796f68..29698431d 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -38,6 +38,7 @@ RUN \ \ # 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 \ diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index d4b994264..ea61af010 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -34,6 +34,7 @@ RUN \ \ # 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 \ diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 7e3547596..a55b860e7 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -33,6 +33,7 @@ RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamp \ # 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 \ diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index cdaf887c8..3d718b908 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -32,6 +32,7 @@ RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamp \ # 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 \ diff --git a/code-server/Dockerfile b/code-server/Dockerfile index cce535901..060df8c4e 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -33,6 +33,7 @@ RUN \ \ # 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 \ diff --git a/flexget/Dockerfile b/flexget/Dockerfile index dd7d42fc4..a11c845f3 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -36,6 +36,7 @@ RUN \ \ # 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 \ diff --git a/grav/Dockerfile b/grav/Dockerfile index 65c96b325..a9b027619 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -37,6 +37,7 @@ RUN \ \ # 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 \ diff --git a/jackett/Dockerfile b/jackett/Dockerfile index e800737fd..a16015e75 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -35,6 +35,7 @@ RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-confi \ # 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 \ diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 6d6bab76e..816e1e325 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -34,6 +34,7 @@ RUN \ \ # 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 \ diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 4fffa88f9..a36094cb8 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -37,6 +37,7 @@ RUN \ \ # 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 \ diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 796da02a4..b4c9579ee 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -35,6 +35,7 @@ RUN sed -i "s|/config|/data|g" /etc/services.d/*/run \ \ # 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 \ diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index 9336f99fb..af7ec0644 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -35,6 +35,7 @@ RUN sed -i "s|/config|/config/addons_config/nzbget|g" /etc/services.d/nzbget/run \ # 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 \ diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 8b541e447..a1d62339c 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -35,6 +35,7 @@ RUN \ \ # 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 \ diff --git a/organizr/Dockerfile b/organizr/Dockerfile index d20c2976a..bba80d407 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -36,6 +36,7 @@ RUN \ \ # 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 \ diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index e8178b441..623239fce 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -36,6 +36,7 @@ RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/serv \ # 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 \ diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index aaadd26cf..e5c3772fb 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -39,6 +39,7 @@ RUN \ \ # 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 \ diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 657c1d62c..81a35f1a6 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -34,6 +34,7 @@ RUN \ \ # 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 \ diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 0d4e67745..c20a69fde 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -33,6 +33,7 @@ RUN \ \ # 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 \ diff --git a/plex/Dockerfile b/plex/Dockerfile index 334c97141..5e658ede5 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -40,6 +40,7 @@ RUN \ \ # 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 \ diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 331367b8a..2bed00559 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -39,6 +39,7 @@ RUN \ \ # 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 \ diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index cda38688f..aeb49f80e 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -33,6 +33,7 @@ RUN \ \ # 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 \ diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index b0ce18b5c..38720f9b5 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -44,6 +44,7 @@ RUN \ \ # 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 \ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index d17276469..8e116a911 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -37,6 +37,7 @@ RUN \ \ # 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 \ diff --git a/readarr/Dockerfile b/readarr/Dockerfile index fc9bbcf1f..e4044d169 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -36,6 +36,7 @@ RUN sed -i "s|/config|/config/addons_config/readarr|g" /etc/services.d/readarr/r \ # 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 \ diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 743154acc..662f551b0 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -36,6 +36,7 @@ RUN \ \ # 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 \ diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index c4646cccf..e792ea8b3 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -38,6 +38,7 @@ RUN \ \ # 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 \ diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 5b06f41ee..db0c06b27 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -38,6 +38,7 @@ RUN \ \ # 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 \ diff --git a/transmission/Dockerfile b/transmission/Dockerfile index e09ba20f0..48f8a5ebf 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -35,6 +35,7 @@ RUN sed -i "s|config|config/transmission|g" /etc/services.d/transmission/run \ \ # 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 \ diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index bc8bcdad3..d8beeb57b 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -32,6 +32,7 @@ RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamp \ # 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 \