From 91c764123c357c4243d67f128a3019632ea5a112 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 11 Aug 2024 09:40:42 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile Dockerfile.3.14 Dockerfile.3.15 Dockerfile.3.16 Dockerfile.3.17 Dockerfile.3.18 Dockerfile.3.19 Dockerfile.3.20 Dockerfile.edge --- Dockerfile | 8 ++++---- Dockerfile.3.14 | 8 ++++---- Dockerfile.3.15 | 8 ++++---- Dockerfile.3.16 | 8 ++++---- Dockerfile.3.17 | 8 ++++---- Dockerfile.3.18 | 8 ++++---- Dockerfile.3.19 | 8 ++++---- Dockerfile.3.20 | 8 ++++---- Dockerfile.edge | 8 ++++---- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Dockerfile b/Dockerfile index dc81d8c..c8f820f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,10 +74,10 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.3.14 b/Dockerfile.3.14 index b142d19..0db386e 100644 --- a/Dockerfile.3.14 +++ b/Dockerfile.3.14 @@ -74,10 +74,10 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.3.15 b/Dockerfile.3.15 index 1e8f1ff..a4c3ba6 100644 --- a/Dockerfile.3.15 +++ b/Dockerfile.3.15 @@ -74,10 +74,10 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.3.16 b/Dockerfile.3.16 index cf4c264..4b49c88 100644 --- a/Dockerfile.3.16 +++ b/Dockerfile.3.16 @@ -74,10 +74,10 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.3.17 b/Dockerfile.3.17 index 0f89ca4..8de7e60 100644 --- a/Dockerfile.3.17 +++ b/Dockerfile.3.17 @@ -74,10 +74,10 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.3.18 b/Dockerfile.3.18 index b7c2992..c7b11a9 100644 --- a/Dockerfile.3.18 +++ b/Dockerfile.3.18 @@ -74,10 +74,10 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.3.19 b/Dockerfile.3.19 index ef5d990..b7ff2c5 100644 --- a/Dockerfile.3.19 +++ b/Dockerfile.3.19 @@ -74,10 +74,10 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.3.20 b/Dockerfile.3.20 index 38b8448..6304a5c 100644 --- a/Dockerfile.3.20 +++ b/Dockerfile.3.20 @@ -74,10 +74,10 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash" SHELL [ "/bin/bash", "-c" ] diff --git a/Dockerfile.edge b/Dockerfile.edge index d9e27d5..1c1f852 100644 --- a/Dockerfile.edge +++ b/Dockerfile.edge @@ -72,10 +72,10 @@ COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ apk --no-cache add bash; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && symlink "\$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "\$BASH_CMD" ] && [ "\$SH_CMD" != "/bin/sh"] && symlink "\$BASH_CMD" "\$SH_CMD" || true; \ - [ -n "\$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh"] && symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'\$BASH_CMD'|g' "/etc/passwd" || true ENV SHELL="/bin/bash"