1 files changed, 3 insertions, 2 deletions
diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh
index 58f0f83f..51ab05e7 100755
--- a/build/build_nexus_blob.sh
+++ b/build/build_nexus_blob.sh
@@ -145,9 +145,9 @@ push_pip () {
 
 docker_login () {
     for REGISTRY in $(sed -n '/\.[^/].*\//p' ${1} | sed -e 's/\/.*$//' | sort -u | grep -v ${DEFAULT_REGISTRY}) ${DOCKER_REGISTRY}; do
-        if ! grep -wq ${REGISTRY} ~/.docker/config.json; then
+        if ! grep -wqs ${REGISTRY} ~/.docker/config.json; then
 	        echo "Docker login to ${REGISTRY}"
-            docker login -u "${NEXUS_USERNAME}" -p "${NEXUS_PASSWORD}" ${REGISTRY} > /dev/null
+            echo -n "${NEXUS_PASSWORD}" | docker login -u "${NEXUS_USERNAME}" --password-stdin ${REGISTRY} > /dev/null
 	    fi
     done
 }
@@ -384,6 +384,7 @@ for NPM_LIST in "${NXS_NPM_LISTS[@]}"; do
     push_npm "${NPM_LIST}"
 done
 popd
+npm logout
 
 ###############################
 ##  Populate PyPi repository  #