diff --git a/.env.scripts b/.env.scripts index 2266138..639b22b 100644 --- a/.env.scripts +++ b/.env.scripts @@ -48,5 +48,5 @@ 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 base-devel mailx postfix python python-pip certbot ca-certificates " +ENV_PACKAGES="bash-completion git curl wget sudo unzip base-devel mailx postfix python python-pip certbot ca-certificates jq " # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Dockerfile b/Dockerfile index 65cf63a..3d3fe70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ ARG SHELL_OPTS ARG AUR_USER ARG AUR_HOME -ARG PACK_LIST="bash-completion git curl wget sudo unzip base-devel mailx postfix python python-pip certbot ca-certificates " +ARG PACK_LIST="bash-completion git curl wget sudo unzip base-devel mailx postfix python python-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -82,10 +82,10 @@ RUN set -e; \ pacman -Sy --noconfirm 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" ]