Disable trace for docker login. (ibm-functions#277)

falkzoll · Dec 13, 2023 · 87a97f6 · 87a97f6
1 parent 33f091a
commit 87a97f6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git 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
@@ -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 \