diff --git a/.env.scripts.edge b/.env.scripts.edge index 3318da5..9bf2cd0 100644 --- a/.env.scripts.edge +++ b/.env.scripts.edge @@ -77,7 +77,7 @@ DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" # - - - - - - - - - - - - - - - - - - - - - - - - - -ENV_PACKAGES="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools sed gawk attr readline lsof less shadow certbot ca-certificates " +ENV_PACKAGES="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils binutils findutils grep rsync zip tini py3-pip procps net-tools sed gawk attr readline lsof less shadow certbot ca-certificates " # - - - - - - - - - - - - - - - - - - - - - - - - - # ex: ts=2 sw=2 et filetype=sh # - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Dockerfile.3.14 b/Dockerfile.3.14 index 89fad57..d6b7cda 100644 --- a/Dockerfile.3.14 +++ b/Dockerfile.3.14 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.3.15 b/Dockerfile.3.15 index 701a235..d2d8388 100644 --- a/Dockerfile.3.15 +++ b/Dockerfile.3.15 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.3.16 b/Dockerfile.3.16 index 5da8ec6..af95715 100644 --- a/Dockerfile.3.16 +++ b/Dockerfile.3.16 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.3.17 b/Dockerfile.3.17 index 09afa78..e695ffc 100644 --- a/Dockerfile.3.17 +++ b/Dockerfile.3.17 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.3.18 b/Dockerfile.3.18 index b3b977d..c0ad480 100644 --- a/Dockerfile.3.18 +++ b/Dockerfile.3.18 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.3.19 b/Dockerfile.3.19 index dfd61a6..131d58a 100644 --- a/Dockerfile.3.19 +++ b/Dockerfile.3.19 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.3.20 b/Dockerfile.3.20 index 99419e9..594e710 100644 --- a/Dockerfile.3.20 +++ b/Dockerfile.3.20 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.3.21 b/Dockerfile.3.21 index 566e451..f66bd9e 100644 --- a/Dockerfile.3.21 +++ b/Dockerfile.3.21 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.3.22 b/Dockerfile.3.22 index d7f75a9..52d5ed9 100644 --- a/Dockerfile.3.22 +++ b/Dockerfile.3.22 @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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" diff --git a/Dockerfile.edge b/Dockerfile.edge index d273ed8..85fee36 100644 --- a/Dockerfile.edge +++ b/Dockerfile.edge @@ -53,7 +53,7 @@ ARG PHP_VERSION ARG PHP_SERVER ARG SHELL_OPTS -ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip tini py3-pip procps net-tools sed gawk attr readline lsof less shadow certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip iproute2 ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils binutils findutils grep rsync zip tini py3-pip procps net-tools sed gawk attr readline lsof less shadow certbot ca-certificates " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -73,9 +73,9 @@ RUN set -e; \ apk --no-cache add bash; \ SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \ BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && /usr/local/bin/symlink "$BASH_CMD" "/usr/bin/sh" || true; \ - [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && /usr/local/bin/symlink "$BASH_CMD" "$SH_CMD" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \ + [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$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"