diff --git a/organizr/Dockerfile b/organizr/Dockerfile index 8be76c41b..ce89a99c5 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -26,7 +26,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -# hadolint ignore=DL4006 +# hadolint ignore=DL4006,SC2013 RUN \ ######################################## # Correct upstream image folders links # diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 8f5079fce..6b6edf96c 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 +# hadolint ignore=DL4006,SC2013 RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/services.d/overseerr/run \ && sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/cont-init.d/30-config \ \ diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index b25bda109..5ef200248 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng # spellcheck disable=SC2015 -# hadolint ignore=SC2015 +# hadolint ignore=DL4006,SC2013 RUN \ ################# # Correct image # diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 8b8d1c54f..e9115f532 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -27,7 +27,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -# hadolint ignore=SC2015 +# hadolint ignore=SC2015,DL4006,SC2013 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 \ diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 3b96d443f..8789806a0 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -27,6 +27,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 +# hadolint ignore=SC2015,DL4006,SC2013 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 \ diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index a7bc7a484..3994b452c 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -29,6 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ ENV HOME=/config/addons_config/plex-data-manager +# hadolint ignore=SC2015,DL4006,SC2013 RUN \ # use /data instead of /config for hass.io environment sed -i "s|/config|/config/addons_config/plex-meta-manager|g" /etc/services.d/*/run \ diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index d4d18f15d..79216206f 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # GLOBAL LSIO MODIFICATIONS -# hadolint ignore=SC2015 +# hadolint ignore=SC2015,DL4006,SC2013 ARG CONFIGLOCATION="/config/addons_config/prowlarr" RUN \ # Avoid custom-init.d duplications @@ -43,12 +43,12 @@ RUN \ sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \ sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done - ################## - # 3 Install apps # - ################## +################## +# 3 Install apps # +################## - # Add rootfs - COPY rootfs/ / +# Add rootfs +COPY rootfs/ / # Corrects permissions for s6 v3 RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index fd5801351..4bf415132 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -27,6 +27,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 +# hadolint ignore=SC2015,DL4006,SC2013 RUN \ # use /data instead of /config for hass.io environment sed -i "s|/config|/config/addons_config/radarr|g" /etc/services.d/radarr/run \ diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 3dcbfb7ef..adabc02cb 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -28,6 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 +# hadolint ignore=SC2015,DL4006,SC2013 RUN sed -i "s|/config|/config/addons_config/readarr|g" /etc/services.d/readarr/run \ && sed -i "s|/config|/config/addons_config/readarr|g" /etc/cont-init.d/30-config \ \ diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 0c8cb29b8..ebf482022 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -27,6 +27,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 +# hadolint ignore=SC2015,DL4006,SC2013 RUN \ # use /data instead of /config for hass.io environment sed -i 's|/config \\|/data \\|g' /etc/cont-init.d/30-config \ diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 7a2a338b1..abfa5a8ae 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -# hadolint ignore=DL4006 +# hadolint ignore=SC2015,DL4006,SC2013 RUN \ ############### # Adapt image #