From 31bbccab06a05b6ca533004d24c3cf4da67cea8c Mon Sep 17 00:00:00 2001 From: Anaël Closson Date: Wed, 15 Feb 2017 16:31:01 +0100 Subject: Adding debugging information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4397c05aba9ecfd55d655f4cac47d415bb25c8e7 Signed-off-by: Anaël Closson --- jjb/include-docker-login.sh | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/jjb/include-docker-login.sh b/jjb/include-docker-login.sh index 89b25163a..3b677b46d 100644 --- a/jjb/include-docker-login.sh +++ b/jjb/include-docker-login.sh @@ -6,7 +6,21 @@ DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \ for DOCKER_REPOSITORY in $DOCKER_REPOSITORIES; do - USER=$(xpath -q -e "//servers/server[id='$DOCKER_REPOSITORY']/username/text()" "$SETTINGS_FILE") - PASS=$(xpath -q -e "//servers/server[id='$DOCKER_REPOSITORY']/password/text()" "$SETTINGS_FILE") - docker login $DOCKER_REPOSITORY -u $USER -p $PASS + echo $DOCKER_REPOSITORY + USER=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/username/text()" "$SETTINGS_FILE") + PASS=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/password/text()" "$SETTINGS_FILE") + + if [ -z "$USER" ]; + then + echo "Error: no user provided" + fi + + if [ -z "$PASS" ]; + then + echo "Error: no password provided" + fi + + [ -z "$PASS" ] && PASS_PROVIDED="" || PASS_PROVIDED="" + echo docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS_PROVIDED" + docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS" done -- cgit 1.2.3-korg