From 87a97f60024bd06289bac05df789172c1c04f449 Mon Sep 17 00:00:00 2001
From: falkzoll <falkzoll@de.ibm.com>
Date: Wed, 13 Dec 2023 14:26:21 +0100
Subject: [PATCH] Disable trace for docker login. (#277)

---
 tools/travis/build.sh   | 15 ++++++++++-----
 tools/travis/publish.sh | 14 +++++++++++---
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 9814a8f..acdb005 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -10,11 +10,16 @@ IMAGE_PREFIX="testing"
 
 export OPENWHISK_HOME=$WHISKDIR
 
-# Login to hub.docker.com to get user specific pull rate.
-if [ ! -z "${DOCKER_USER}" ] && [ ! -z "${DOCKER_PASSWORD}" ]; then
-  echo "Run docker login..."
-  echo ${DOCKER_PASSWORD} | docker login -u "${DOCKER_USER}" --password-stdin
-fi
+# run login in a subshell with disabled trace to avoid having credentials in the logs
+# when trace is on (set -x)
+(
+  set +x # disable trace in this subshell
+  # Login to hub.docker.com to get user specific pull rate.
+  if [ ! -z "${DOCKER_USER}" ] && [ ! -z "${DOCKER_PASSWORD}" ]; then
+    echo "Run docker login..."
+    echo ${DOCKER_PASSWORD} | docker login -u "${DOCKER_USER}" --password-stdin
+  fi
+)
 
 # Build OpenWhisk
 cd $WHISKDIR
diff --git a/tools/travis/publish.sh b/tools/travis/publish.sh
index 348e701..bade120 100755
--- a/tools/travis/publish.sh
+++ b/tools/travis/publish.sh
@@ -24,9 +24,17 @@ elif [ ${RUNTIME_VERSION} == "3.11" ]; then
   RUNTIME="python3.11"
 fi
 
-if [[ ! -z ${DOCKER_USER} ]] && [[ ! -z ${DOCKER_PASSWORD} ]]; then
-docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-fi
+# run login in a subshell with disabled trace to avoid having credentials in the logs
+# when trace is on (set -x)
+(
+  set +x # disable trace in this subshell
+  # Login to hub.docker.com to get user specific pull rate.
+  if [ ! -z "${DOCKER_USER}" ] && [ ! -z "${DOCKER_PASSWORD}" ]; then
+    echo "Run docker login..."
+    echo ${DOCKER_PASSWORD} | docker login -u "${DOCKER_USER}" --password-stdin
+  fi
+)
+
 
 if [[ ! -z ${RUNTIME} ]]; then
 TERM=dumb ./gradlew \