From c5a4ced80bd15b60d3cd38e1514be8f607d81af0 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 28 Aug 2022 23:17:46 +0100 Subject: [PATCH 1/3] Fix custom script banner tee --- root/etc/s6-overlay/s6-rc.d/init-script-check/run | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-script-check/run b/root/etc/s6-overlay/s6-rc.d/init-script-check/run index dc2ee8b..35fe496 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-script-check/run +++ b/root/etc/s6-overlay/s6-rc.d/init-script-check/run @@ -3,7 +3,7 @@ if [[ -n "$(/bin/ls -A "/config/custom-cont-init.d" 2>/dev/null)" ]] || [[ -n "$(/bin/ls -A "/config/custom-services.d" 2>/dev/null)" ]]; then - cat <<-EOF | tee /config/custom-cont-init.d/README.txt,/config/custom-services.d/README.txt 2>/dev/null + cat << EOF | tee {/config/custom-cont-init.d/README.txt,/config/custom-services.d/README.txt} 2>/dev/null ******************************************************** ******************************************************** * * @@ -20,4 +20,3 @@ if [[ -n "$(/bin/ls -A "/config/custom-cont-init.d" 2>/dev/null)" ]] || ******************************************************** EOF fi -exit 0 From c344d785c53c2fcb704a17d17cd966959c215ca9 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 28 Aug 2022 23:18:44 +0100 Subject: [PATCH 2/3] Fix missing exit --- root/etc/s6-overlay/s6-rc.d/init-script-check/run | 1 + 1 file changed, 1 insertion(+) diff --git a/root/etc/s6-overlay/s6-rc.d/init-script-check/run b/root/etc/s6-overlay/s6-rc.d/init-script-check/run index 35fe496..74b73e7 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-script-check/run +++ b/root/etc/s6-overlay/s6-rc.d/init-script-check/run @@ -20,3 +20,4 @@ if [[ -n "$(/bin/ls -A "/config/custom-cont-init.d" 2>/dev/null)" ]] || ******************************************************** EOF fi +exit 0 From b0b95aaf4abdb05ba1dbd10a12bbbc954debd5c5 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 29 Aug 2022 23:07:09 +0100 Subject: [PATCH 3/3] Bump s6 to 3.1.2.1 to fix regression --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 01bc180..a957a5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.2.0" +ARG S6_OVERLAY_VERSION="3.1.2.1" ARG S6_OVERLAY_ARCH="x86_64" # add s6 overlay diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0768842..6ef78f2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -36,7 +36,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.2.0" +ARG S6_OVERLAY_VERSION="3.1.2.1" ARG S6_OVERLAY_ARCH="aarch64" # add s6 overlay diff --git a/Dockerfile.armhf b/Dockerfile.armhf index cd5fdab..46aff45 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -36,7 +36,7 @@ RUN \ sed -i -e 's/^root::/root:!:/' /root-out/etc/shadow # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.2.0" +ARG S6_OVERLAY_VERSION="3.1.2.1" ARG S6_OVERLAY_ARCH="armhf" # add s6 overlay