X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fdocker-login.sh;h=d172a3b29f346d68afbdfb01b04ff0df8da2aaf2;hb=869293dc91ff3a74906aea037f91d487da28d5aa;hp=72d420f30602d47a785cb4eddb6948ffb8e0cc27;hpb=0c2d2eea337b2700a7913d03aa5afd75d0c11b93;p=releng%2Fglobal-jjb.git diff --git a/shell/docker-login.sh b/shell/docker-login.sh index 72d420f3..d172a3b2 100644 --- a/shell/docker-login.sh +++ b/shell/docker-login.sh @@ -61,14 +61,12 @@ set_creds() { USER=$(echo "$CREDENTIAL" | cut -f1 -d:) PASS=$(echo "$CREDENTIAL" | cut -f2 -d:) - if [ -z "$USER" ] - then + if [ -z "$USER" ]; then echo "ERROR: No user provided" return 1 fi - if [ -z "$PASS" ] - then + if [ -z "$PASS" ]; then echo "ERROR: No password provided" return 1 fi @@ -92,10 +90,8 @@ do_login() { ### Main ### # Loop through Registry and Ports to concatentate and login to nexus -if [ "${DOCKER_REGISTRY:-none}" != 'none' ] -then - for PORT in $REGISTRY_PORTS - do +if [ "${DOCKER_REGISTRY:-none}" != 'none' ]; then + for PORT in $REGISTRY_PORTS; do REGISTRY="${DOCKER_REGISTRY}:${PORT}" # docker login requests an email address if nothing is passed to it @@ -106,11 +102,9 @@ then fi # Login to docker.io after determining if email is needed. -if [ "${DOCKERHUB_REGISTRY:-none}" != 'none' ] -then +if [ "${DOCKERHUB_REGISTRY:-none}" != 'none' ]; then set_creds "$DOCKERHUB_REGISTRY" - if [ "${DOCKERHUB_EMAIL:-none}" != 'none' ] - then + if [ "${DOCKERHUB_EMAIL:-none}" != 'none' ]; then do_login "$DOCKERHUB_REGISTRY" "$DOCKERHUB_EMAIL" else do_login "$DOCKERHUB_REGISTRY" none