From 9e93bac618f90e72422f1e30a66008bd8f644f91 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 10 Aug 2024 20:47:35 -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.8 Dockerfile.9 --- Dockerfile | 6 +++--- Dockerfile.8 | 6 +++--- Dockerfile.9 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index e2c47ff..67c2ede 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,9 +71,9 @@ RUN set -e; \ yum makecache && yum install -yy bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && { rm -Rf "$SH_CMD";ln -s "$BASH_CMD" "$SH_CMD"; } || true; \ - [ -x "$BASH_CMD" ] && [ ! -L "/bin/sh" ] && { rm -rf "/bin/sh" || true; } && ln -sf "$BASH_CMD" "/bin/sh" || true + [ -x "$BASH_CMD" ] && { rm -Rf "$SH_CMD"|| true ;ln -s "$BASH_CMD" "$SH_CMD"; } || true; \ + [ -x "$BASH_CMD" ] && { rm -rf "/bin/sh" || true; } && ln -sf "$BASH_CMD" "/bin/sh" || 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.8 b/Dockerfile.8 index c0fcafd..668a37f 100644 --- a/Dockerfile.8 +++ b/Dockerfile.8 @@ -71,9 +71,9 @@ RUN set -e; \ yum makecache && yum install -yy bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && { rm -Rf "$SH_CMD";ln -s "$BASH_CMD" "$SH_CMD"; } || true; \ - [ -x "$BASH_CMD" ] && [ ! -L "/bin/sh" ] && { rm -rf "/bin/sh" || true; } && ln -sf "$BASH_CMD" "/bin/sh" || true + [ -x "$BASH_CMD" ] && { rm -Rf "$SH_CMD"|| true ;ln -s "$BASH_CMD" "$SH_CMD"; } || true; \ + [ -x "$BASH_CMD" ] && { rm -rf "/bin/sh" || true; } && ln -sf "$BASH_CMD" "/bin/sh" || 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.9 b/Dockerfile.9 index 49668ef..7832a25 100644 --- a/Dockerfile.9 +++ b/Dockerfile.9 @@ -71,9 +71,9 @@ RUN set -e; \ yum makecache && yum install -yy bash; \ SH_CMD="$(which sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null)"; \ - [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && { rm -Rf "$SH_CMD";ln -s "$BASH_CMD" "$SH_CMD"; } || true; \ - [ -x "$BASH_CMD" ] && [ ! -L "/bin/sh" ] && { rm -rf "/bin/sh" || true; } && ln -sf "$BASH_CMD" "/bin/sh" || true + [ -x "$BASH_CMD" ] && { rm -Rf "$SH_CMD"|| true ;ln -s "$BASH_CMD" "$SH_CMD"; } || true; \ + [ -x "$BASH_CMD" ] && { rm -rf "/bin/sh" || true; } && ln -sf "$BASH_CMD" "/bin/sh" || 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" ]