X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fdocker-login.sh;h=92da7e0d03f213c7601f5dcda471825659492e82;hb=f75d04ed3780933fb82b31c596f579e482dd6d06;hp=2c8a40bbe44fcc137dd194f61d5d87f687ad47d9;hpb=b2c0cd2452fced0db95950dbe65fce1ac70f8dfe;p=releng%2Fglobal-jjb.git

diff --git a/shell/docker-login.sh b/shell/docker-login.sh
index 2c8a40bb..92da7e0d 100644
--- a/shell/docker-login.sh
+++ b/shell/docker-login.sh
@@ -35,6 +35,7 @@ set -eu -o pipefail
 
 # Execute the credential lookup and login to the registry
 do_login() {
+    set +x  # Ensure that no other scripts add `set -x` and print passwords
     echo "$1"
     CREDENTIAL=$(xmlstarlet sel -N "x=http://maven.apache.org/SETTINGS/1.0.0" \
         -t -m "/x:settings/x:servers/x:server[starts-with(x:id, '${1}')]" \
@@ -56,7 +57,18 @@ do_login() {
         return 1
     fi
 
-    docker login -u "$USER" -p "$PASS" -e "$2" "$1"
+    docker_version=$(docker -v | awk '{print $3}')
+    compare_value=$(echo "17.06.0 $docker_version" | \
+                    tr " " "\n" | \
+                    sort -V | \
+                    sed -n 1p)
+    if [[ "$docker_version" == "$compare_value" && \
+          "$docker_version" != "17.06.0" ]]
+    then
+        docker login -u "$USER" -p "$PASS" -e "$2" "$1"
+    else
+        docker login -u "$USER" -p "$PASS" "$1"
+    fi
 }
 
 if [ "${DOCKER_REGISTRY:-none}" != 'none' ]