Adding debugging information
authorAnaël Closson <ac2550@intl.att.com>
Wed, 15 Feb 2017 15:31:01 +0000 (16:31 +0100)
committerAnaël Closson <ac2550@intl.att.com>
Wed, 15 Feb 2017 19:21:49 +0000 (19:21 +0000)
Change-Id: I4397c05aba9ecfd55d655f4cac47d415bb25c8e7
Signed-off-by: Anaël Closson <ac2550@intl.att.com>
jjb/include-docker-login.sh

index 89b2516..3b677b4 100644 (file)
@@ -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="<empty>" || PASS_PROVIDED="<password>"
+    echo docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS_PROVIDED"
+    docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS"
 done