X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fdocker-login.sh;h=73d0603c75bdd5c12c0df3a15f2337ac12e86da6;hb=refs%2Ftags%2Fv0.89.5;hp=d172a3b29f346d68afbdfb01b04ff0df8da2aaf2;hpb=987dd81473e9c5090aab1e80ad47acd1f7974d7c;p=releng%2Fglobal-jjb.git diff --git a/shell/docker-login.sh b/shell/docker-login.sh index d172a3b2..73d0603c 100644 --- a/shell/docker-login.sh +++ b/shell/docker-login.sh @@ -46,8 +46,10 @@ echo "---> docker-login.sh" # Ensure we fail the job if any steps fail set -eu -o pipefail -#Check if current version less than desired version -version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; } +# Check if current version less than desired version +version_lt() { + test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; +} # Execute the credential lookup and set set_creds() { @@ -77,7 +79,7 @@ set_creds() { do_login() { docker_version=$( docker -v | awk '{print $3}') if version_lt "$docker_version" "17.06.0" && \ - "$DOCKERHUB_REGISTRY" == "docker.io" && \ + [ "$DOCKERHUB_REGISTRY" == "docker.io" ] && \ "$DOCKERHUB_EMAIL:-none" != 'none' then docker login -u "$USER" -p "$PASS" -e "$2" "$1"