summaryrefslogtreecommitdiffstats
path: root/jjb/include-docker-login.sh
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/include-docker-login.sh')
-rw-r--r--jjb/include-docker-login.sh20
1 files 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="<empty>" || PASS_PROVIDED="<password>"
+ echo docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS_PROVIDED"
+ docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS"
done