From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Tue, 25 Jul 2017 20:30:23 +0000 (-0700)
Subject: Fix docker login for custom registry
X-Git-Tag: v0.5.3^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F29%2F5629%2F1;hp=76eab87ffe09d31e67744b01e67336c5f3a6ac86;p=releng%2Fglobal-jjb.git

Fix docker login for custom registry

Custom registry detection fails to be detected if the corresponding
Jenkins environment variable is not properly referenced.

Change-Id: I618836ca4e9364045b01c7d710ac00f359a1e025
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/shell/docker-login.sh b/shell/docker-login.sh
index 4b8233d7..2c8a40bb 100644
--- a/shell/docker-login.sh
+++ b/shell/docker-login.sh
@@ -59,7 +59,7 @@ do_login() {
     docker login -u "$USER" -p "$PASS" -e "$2" "$1"
 }
 
-if [ "${REGISTRY:-none}" != 'none' ]
+if [ "${DOCKER_REGISTRY:-none}" != 'none' ]
 then
     for PORT in $REGISTRY_PORTS
     do