[GENERAL] Add Andreas Geissler as committer.

[oom/offline-installer.git] / build / build_nexus_blob.sh

diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh
index 004528d..ddc3145 100755 (executable)
--- a/build/build_nexus_blob.sh
+++ b/build/build_nexus_blob.sh
@@ -156,10 +156,8 @@ push_pip () {
 }
 
 docker_login () {
-    if ! grep -wqs ${DOCKER_REGISTRY} ~/.docker/config.json; then
-        echo "Docker login to ${DOCKER_REGISTRY}"
-        echo -n "${NEXUS_PASSWORD}" | docker login -u "${NEXUS_USERNAME}" --password-stdin ${DOCKER_REGISTRY} > /dev/null
-    fi
+    echo "Docker login to ${DOCKER_REGISTRY}"
+    echo -n "${NEXUS_PASSWORD}" | docker --config "${DOCKER_CONFIG_DIR}" login -u "${NEXUS_USERNAME}" --password-stdin ${DOCKER_REGISTRY} > /dev/null
 }
 
 push_docker () {
@@ -181,7 +179,7 @@ push_docker () {
             PUSH="$(sed -e 's/'"${repo_host}"'/'"${DOCKER_REGISTRY}"'/' <<< ${IMAGE})"
         fi
         docker tag ${IMAGE} ${PUSH}
-        docker push ${PUSH}
+        docker --config "${DOCKER_CONFIG_DIR}" push ${PUSH}
         # Remove created tag
         docker rmi ${PUSH}
         echo "${IMAGE} pushed as ${PUSH} to Nexus"
@@ -269,6 +267,7 @@ NXS_INFRA_LIST="${LISTS_DIR}/infra_docker_images.list"
 NXS_DOCKER_IMG_LIST="${LISTS_DIR}/onap_docker_images.list"
 NXS_RKE_DOCKER_IMG_LIST="${LISTS_DIR}/rke_docker_images.list"
 NXS_K8S_DOCKER_IMG_LIST="${LISTS_DIR}/k8s_docker_images.list"
+NXS_PROMETHEUS_DOCKER_IMG_LIST="${LISTS_DIR}/kube_prometheus_stack_docker_images.list"
 
 # Setup Nexus image used for build and install infra
 NEXUS_IMAGE="$(grep sonatype/nexus3 ${NXS_INFRA_LIST})"
@@ -276,14 +275,11 @@ NEXUS_IMAGE_TAR="${DATA_DIR}/offline_data/docker_images_infra/$(sed 's/\//\_/ ;
 
 # Set default lists if nothing specific defined by user
 if [ ${#NXS_DOCKER_IMG_LISTS[@]} -eq 0 ]; then
-    NXS_DOCKER_IMG_LISTS=("${NXS_DOCKER_IMG_LIST}" "${NXS_RKE_DOCKER_IMG_LIST}" "${NXS_K8S_DOCKER_IMG_LIST}")
+    NXS_DOCKER_IMG_LISTS=("${NXS_DOCKER_IMG_LIST}" "${NXS_RKE_DOCKER_IMG_LIST}" "${NXS_K8S_DOCKER_IMG_LIST}" "${NXS_PROMETHEUS_DOCKER_IMG_LIST}")
 fi
 
-# Backup the current docker registry settings
-if [ -f ~/.docker/config.json ]; then
-    DOCKER_CONF_BACKUP="$(eval ${TIMESTAMP}_config.json.bk)"
-    mv ~/.docker/config.json ~/.docker/${DOCKER_CONF_BACKUP}
-fi
+# Create Docker client config dir
+DOCKER_CONFIG_DIR=$(mktemp -p /tmp -d .docker.XXXXXXXX)
 
 # Setup default ports published to host as docker registry
 PUBLISHED_PORTS="-p ${NEXUS_PORT}:${NEXUS_EXPOSED_PORT} -p ${NEXUS_DOCKER_PORT}:${NEXUS_DOCKER_EXPOSED_PORT}"
@@ -425,14 +421,13 @@ done
 # Stop the Nexus and cleanup #
 ##############################
 
-echo "Stopping Nexus and returning backups"
+echo "Stopping Nexus"
 
 # Stop the Nexus
 docker stop ${NEXUS_CONT_ID} > /dev/null
 
-if [ -f ~/.docker/${DOCKER_CONF_BACKUP} ]; then
-    mv -f ~/.docker/${DOCKER_CONF_BACKUP} ~/.docker/config.json
-fi
+# Drop temporary Docker client config dir
+rm -rf ${DOCKER_CONFIG_DIR}
 
 echo "Nexus blob is built"
 exit 0