From: Michal Zegan <m.zegan@samsung.com>
Date: Wed, 4 Sep 2019 10:45:25 +0000 (+0000)
Subject: Merge "Skip annoying message if config.json not exists"
X-Git-Tag: 6.0.0-ONAP~102
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a16fa6022a3bc2bf3a906a722f6fed6c74e5fd88;p=oom%2Foffline-installer.git

Merge "Skip annoying message if config.json not exists"
---

a16fa6022a3bc2bf3a906a722f6fed6c74e5fd88
diff --cc build/build_nexus_blob.sh
index 68d9337a,dff2fc8d..51ab05e7
--- a/build/build_nexus_blob.sh
+++ b/build/build_nexus_blob.sh
@@@ -145,9 -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
  }