From a240ebb3e2a82293da5d4cc8b647a44d925951b2 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:43:47 +0100 Subject: [PATCH 1/4] Correction --- emby/rootfs/etc/cont-init.d/91-silent.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emby/rootfs/etc/cont-init.d/91-silent.sh b/emby/rootfs/etc/cont-init.d/91-silent.sh index 109d4d0b4..d647be6ae 100644 --- a/emby/rootfs/etc/cont-init.d/91-silent.sh +++ b/emby/rootfs/etc/cont-init.d/91-silent.sh @@ -1,4 +1,4 @@ -É#!/usr/bin/with-contenv bashio +#!/usr/bin/with-contenv bashio # shellcheck shell=bash ############### @@ -6,7 +6,7 @@ ############### if bashio::config.true 'silent'; then - APPEND=' > /dev/null' + APPEND=' >/dev/null' sed -i '$s|$|'"$APPEND"'|' /etc/s6-overlay/s6-rc.d/*/run bashio::log.info 'Silent mode activated, all logs from emby server are hidden. Disable this option if you need to troubleshoot the addon.' fi From 1cf60b186df3b78e94a075b159ed4d9112093313 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:44:41 +0100 Subject: [PATCH 2/4] Update Dockerfile --- flexget/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flexget/Dockerfile b/flexget/Dockerfile index b5245e427..d992eb7f5 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# hadolint ignore=SC2016 +# hadolint ignore=SC2016,SC2086 RUN \ # Set password files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/s6-overlay/s6-rc.d) \ @@ -39,7 +39,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/flexget" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015,SC2013,SC2236 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \ From bfd6424cdee7136d7c482df467012bbce39774b5 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:45:18 +0100 Subject: [PATCH 3/4] Update Dockerfile --- nextcloud/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 6ded6363a..35170e006 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -33,7 +33,7 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" # Global LSIO modifications ARG CONFIGLOCATION="/data/config" -# shellcheck disable=SC2046 +# shellcheck disable=SC2046,SC2013 RUN \ # Remove upstream files rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \ From 979ab2cdd4937ec3556795b54d06087a8bf4b231 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 31 Oct 2022 09:46:06 +0100 Subject: [PATCH 4/4] Update Dockerfile --- plex/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plex/Dockerfile b/plex/Dockerfile index 6a2321cea..2dda1e0db 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Image specific modifications -# hadolint ignore=SC2016 +# hadolint ignore=SC2016,SC2086 RUN \ # CORRECT PLEX CLAIM file=$(grep -sril 'Server claimed successfully' /etc) \ @@ -38,7 +38,7 @@ RUN \ # Global LSIO modifications ARG CONFIGLOCATION="/config" -# hadolint ignore=SC2015, SC2013 +# hadolint ignore=SC2015,SC2013,SC2236 RUN \ # Avoid custom-init.d duplications for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \