From 0945d0d5098902e7cc8bcdb15231040b4afa6f42 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 3 Aug 2022 21:07:24 +0200 Subject: [PATCH] Avoid automatic config modification https://github.com/alexbelgium/hassio-addons/pull/413 --- bazarr/Dockerfile | 3 ++- booksonic_air/Dockerfile | 3 ++- calibre/Dockerfile | 3 ++- calibre_web/Dockerfile | 3 ++- code-server/Dockerfile | 3 ++- flexget/Dockerfile | 3 ++- grav/Dockerfile | 3 ++- jackett/Dockerfile | 3 ++- jellyfin/Dockerfile | 3 ++- lidarr/Dockerfile | 3 ++- mylar3/Dockerfile | 3 ++- nzbget/Dockerfile | 3 ++- ombi/Dockerfile | 3 ++- organizr/Dockerfile | 3 ++- overseerr/Dockerfile | 3 ++- paperless_ngx/Dockerfile | 3 ++- papermerge/Dockerfile | 3 ++- piwigo/Dockerfile | 3 ++- plex/Dockerfile | 3 ++- plex_meta_manager/Dockerfile | 3 ++- prowlarr/Dockerfile | 3 ++- qbittorrent/Dockerfile | 3 ++- radarr/Dockerfile | 3 ++- readarr/Dockerfile | 3 ++- requestrr/Dockerfile | 3 ++- resiliosync/Dockerfile | 3 ++- scrutiny/Dockerfile | 3 ++- scrutiny_fa/Dockerfile | 3 ++- sonarr/Dockerfile | 3 ++- transmission/Dockerfile | 3 ++- webtop_kde/Dockerfile | 3 ++- 31 files changed, 62 insertions(+), 31 deletions(-) diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index ef30f2688..d52cc90e8 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -35,7 +35,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index cc70fe2fb..ed953d42a 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -31,7 +31,8 @@ ENV BOOKSONIC_AIR_SETTINGS="/data" 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 3b807ebd1..939f2f8a7 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -30,7 +30,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 6449e750c..ac922b377 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -30,7 +30,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/code-server/Dockerfile b/code-server/Dockerfile index de04d9c67..fd58a5da0 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -30,7 +30,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ # MOFIFY DATA PATH diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 8ad8c2846..013a92c7f 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -33,7 +33,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/grav/Dockerfile b/grav/Dockerfile index 37e1084c8..5f2d982c1 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -34,7 +34,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/jackett/Dockerfile b/jackett/Dockerfile index f36759f63..93e5f3040 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -32,7 +32,8 @@ RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-confi \ # Allow UID and GID setting && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index f0ea5711c..09df9a8aa 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -31,7 +31,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index afbf02e24..a4979aae8 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -34,7 +34,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 1d88fc32a..63f8823f8 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -32,7 +32,8 @@ RUN sed -i "s|/config|/data|g" /etc/services.d/*/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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index c28320c94..85c2f5b1b 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -32,7 +32,8 @@ 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/10-adduser \ # Allow UID and GID setting && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ # Create folder diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 87449a849..cda1970a9 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -32,7 +32,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 26a018cdd..6b099646c 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -33,7 +33,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 3158d6da1..be89b8516 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -33,7 +33,8 @@ RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/serv \ # Allow UID and GID setting && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 1bb4309d5..725b75ae0 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -36,7 +36,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ # Change config location diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 515a79078..ea23490fe 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -31,7 +31,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ # Change config path diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 0672286e5..a35fa45b8 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -30,7 +30,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/plex/Dockerfile b/plex/Dockerfile index 1ed1f2fe3..704fa53b5 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -37,7 +37,8 @@ RUN \ ############################# \ if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ && 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 2bb47d764..003d43844 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -36,7 +36,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 469a04f15..de0448ef9 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -30,7 +30,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index e1c6eb410..1bdb4d129 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -41,7 +41,8 @@ ENV \ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index df182f7ad..707a4d332 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -34,7 +34,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 883568e17..97affdf96 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -33,7 +33,8 @@ RUN sed -i "s|/config|/config/addons_config/radarr/readarr|g" /etc/services.d/re \ # Allow UID and GID setting && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 6e020c829..03a03808a 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -33,7 +33,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index e27c4ce92..e2e606b08 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -35,7 +35,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \ diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index 7d6df1486..89b5e3313 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -33,7 +33,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ # use /data instead of /config for database diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index 686e71b2d..efd153ddf 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -32,7 +32,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ # use /data instead of /config for database diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index c77e49978..fa1acc7f3 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -35,7 +35,8 @@ 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/transmission/Dockerfile b/transmission/Dockerfile index e3c4e6f8b..bff0da7c0 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -32,7 +32,8 @@ 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 \ # Allow UID and GID setting && if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 0168f2b35..e88361ac7 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -29,7 +29,8 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # 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 \ - && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ +    && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \ && 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 \ \