X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fdocker-login.sh;h=6613118e71c22c98d44301fbeb3343a05a5ad8df;hb=fc00439357256a05f1b56220c64eee0acb81315f;hp=4b8233d72e36f942fde1e73b6f9836b14723936b;hpb=a99cfe8b7c3e3b33cf9f210a90c50ea65128b30e;p=releng%2Fglobal-jjb.git

diff --git a/shell/docker-login.sh b/shell/docker-login.sh
index 4b8233d7..6613118e 100644
--- a/shell/docker-login.sh
+++ b/shell/docker-login.sh
@@ -56,10 +56,21 @@ 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 [ "${REGISTRY:-none}" != 'none' ]
+if [ "${DOCKER_REGISTRY:-none}" != 'none' ]
 then
     for PORT in $REGISTRY_PORTS
     do