From 1988cdd26baf74f7b66f7cb14d641777a1ef95ba Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Thu, 8 Aug 2019 14:47:30 +0200 Subject: [PATCH] kas-docker: Propagate only supported SHELL settings Other values will cause the container to fail because the shell binary is missing. This avoids non-obvious failures when the host SHELL is configured differently. Reported-by: Phillipp von Rotenhan Signed-off-by: Jan Kiszka --- kas-docker | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kas-docker b/kas-docker index 581c1af..64aa00b 100755 --- a/kas-docker +++ b/kas-docker @@ -217,13 +217,20 @@ fi set -- ${DOCKER_ARGS} -for var in SHELL TERM KAS_DISTRO KAS_MACHINE KAS_TARGET KAS_TASK \ +for var in TERM KAS_DISTRO KAS_MACHINE KAS_TARGET KAS_TASK \ KAS_PREMIRRORS; do if [ -n "$(eval echo \$${var})" ]; then set -- "$@" -e "${var}='$(eval echo \"\$${var}\")'" fi done +# propagate only supported SHELL settings +case "$SHELL" in +/bin/sh|/bin/bash|/bin/dash) + set -- "$@" -e "SHELL='$(eval echo \"\$SHELL\")'" + ;; +esac + if [ -z "${NO_PROXY_FROM_ENV+x}" ]; then for var in http_proxy https_proxy ftp_proxy no_proxy NO_PROXY; do if [ -n "$(eval echo \$${var})" ]; then