Merge "Skip annoying message if config.json not exists"
authorMichal Zegan <m.zegan@samsung.com>
Wed, 4 Sep 2019 10:45:25 +0000 (10:45 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 4 Sep 2019 10:45:25 +0000 (10:45 +0000)
1  2 
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
  }