From 32345bfe4d2954775f094b49a11e5efd7e1da49c Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 10 Sep 2022 17:28:11 +0200 Subject: [PATCH] Avoid global permissions on config --- bazarr/Dockerfile | 2 +- booksonic_air/Dockerfile | 2 +- calibre/Dockerfile | 2 +- calibre_web/Dockerfile | 2 +- code-server/Dockerfile | 2 +- emby/Dockerfile | 2 +- flexget/Dockerfile | 2 +- grav/Dockerfile | 2 +- jackett/Dockerfile | 2 +- jellyfin/Dockerfile | 2 +- lidarr/Dockerfile | 2 +- mylar3/Dockerfile | 2 +- nzbget/Dockerfile | 2 +- ombi/Dockerfile | 2 +- organizr/Dockerfile | 2 +- overseerr/Dockerfile | 2 +- paperless_ngx/Dockerfile | 2 +- papermerge/Dockerfile | 2 +- piwigo/Dockerfile | 2 +- plex/Dockerfile | 2 +- plex_meta_manager/Dockerfile | 2 +- prowlarr/Dockerfile | 2 +- qbittorrent/Dockerfile | 2 +- radarr/Dockerfile | 2 +- readarr/Dockerfile | 2 +- requestrr/Dockerfile | 2 +- resiliosync/Dockerfile | 2 +- sonarr/Dockerfile | 2 +- transmission/Dockerfile | 2 +- ubooquity/Dockerfile | 2 +- webtop_kde/Dockerfile | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index ba8e0e00b..416946cff 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index c75dad176..60963d25b 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -46,7 +46,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 9af44cc4e..bf90be703 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -45,7 +45,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done # Specific images modifications RUN \ diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 2efa685f0..6892dea66 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -45,7 +45,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done # Specific images modifications RUN \ diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 5d35c7aab..36352550a 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/emby/Dockerfile b/emby/Dockerfile index 57576f5ee..fa14d9aea 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 6d4902687..a6d2aaf51 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -54,7 +54,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/grav/Dockerfile b/grav/Dockerfile index f9b2ee0c5..059067648 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 46064fd57..8426b793c 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done # Changes config directory ENV XDG_CONFIG_HOME="/config/addons_config" diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 29faffc8c..0733c5075 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -45,7 +45,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 036989749..62b685380 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 075adab14..b6d3f605c 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index 293245829..4755a40a3 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -48,7 +48,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 611eda450..e518bf0b2 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/organizr/Dockerfile b/organizr/Dockerfile index f55867bb3..b056c5532 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -43,7 +43,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 9426bb258..cb6c34877 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -45,7 +45,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index b096b1cb0..01be48ca7 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index e07086b7e..a85808d25 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -51,7 +51,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index abb7ace3d..f34753584 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/plex/Dockerfile b/plex/Dockerfile index 183079e1d..7625fc9aa 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -53,7 +53,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index df5310a6f..c8345f36b 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -52,7 +52,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index ae524b18a..0a02a20b9 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index b3cd7b1c7..5beb5025c 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -64,7 +64,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 9942ae097..8355688fb 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 5779a56f3..3fd546b22 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -45,7 +45,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 1a41a53b7..ca3915ec6 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 67569c26e..f50566310 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -54,7 +54,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 63e3370b4..9a743298c 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -45,7 +45,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/transmission/Dockerfile b/transmission/Dockerfile index f322c89ee..c373537fc 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -44,7 +44,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 24e2963e1..20e3c8601 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -54,7 +54,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps # diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 010083b07..6da72e1d4 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -57,7 +57,7 @@ RUN \ && for file in $(grep -Esril '/config[ /]|/config$' /etc/logrotate.d /defaults /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do sed -i "s=/config=$CONFIGLOCATION=g" "$file"; done \ \ # Avoid changing /config permissions - && for file in $(grep -srl "chown abc:abc \/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "/chown abc:abc \/config/d" "$file"; done + && for file in $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' /etc/services.d/*/run /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/run); do sed -i "/abc:abc/d" "$file" && sed -i "/\/config/d" "$file"; done ################## # 3 Install apps #