X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=build%2Fbuild_nexus_blob.sh;h=ddc3145b2a1b6f09b30f4a0bdf3acd508d193db0;hb=cf9b45ba91722e7cb4089cc256af29901893c44a;hp=ae3f8870f3f46173d8b882ab784af34536dbe622;hpb=4b86e113ae7e2d7f2d42afd76edab9126030fb23;p=oom%2Foffline-installer.git

diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh
index ae3f8870..ddc3145b 100755
--- a/build/build_nexus_blob.sh
+++ b/build/build_nexus_blob.sh
@@ -37,8 +37,11 @@ exec &> >(tee -a "${SCRIPT_LOG}")
 
 # Nexus repository properties
 NEXUS_DOMAIN="nexus"
-NEXUS_PORT="8081"
-NEXUS_DOCKER_PORT="8082"
+NEXUS_HOST="127.0.0.1"
+NEXUS_EXPOSED_PORT="8081"
+NEXUS_PORT=${NEXUS_EXPOSED_PORT}
+NEXUS_DOCKER_EXPOSED_PORT="8082"
+NEXUS_DOCKER_PORT=${NEXUS_DOCKER_EXPOSED_PORT}
 DEFAULT_REGISTRY="docker.io"
 
 # Nexus repository credentials
@@ -95,19 +98,12 @@ usage () {
      -p  | --pypi                       use specific list of pypi packages to be pushed into Nexus
      -rl | --resource-list-directory    use specific directory with docker, pypi and npm lists
      -c  | --container-name             use specific Nexus docker container name
+     -NP | --nexus-port                 use specific port for published Nexus service
+     -DP | --docker-port                use specific port for published Nexus docker registry port
     "
     exit 1
 }
 
-simulated_hosts () {
-    SIMUL_HOSTS=($(sed -n '/\.[^/].*\//p' ${1} | sed -e 's/\/.*$// ; s/:.*$//' | sort -u | grep -v ${DEFAULT_REGISTRY} || true ) ${NEXUS_DOMAIN})
-    for HOST in "${SIMUL_HOSTS[@]}"; do
-        if ! grep -wq ${HOST} /etc/hosts; then
-            echo "127.0.0.1 ${HOST}" >> /etc/hosts
-        fi
-    done
-}
-
 load_docker_images () {
     for ARCHIVE in $(sed $'s/\r// ; /^#/d ; s/\:/\_/g ; s/\//\_/g ; s/$/\.tar/g' ${1} | awk '{ print $1 }'); do
         docker load -i ${NXS_SRC_DOCKER_IMG_DIR}/${ARCHIVE}
@@ -160,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 () {
@@ -185,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"
@@ -231,6 +225,12 @@ while [ "${1}" != "" ]; do
         -rl | --resource-list-directory )  shift
                                            LISTS_DIR="$(realpath ${1})"
                                            ;;
+        -NP | --nexus-port )               shift
+                                           NEXUS_PORT="${1}"
+                                           ;;
+        -DP | --docker-port )              shift
+                                           NEXUS_DOCKER_PORT="${1}"
+                                           ;;
         -h | --help )                      usage
                                            ;;
         *)                                 usage
@@ -253,9 +253,9 @@ if [ ${#FAILED_COMMANDS[*]} -gt 0 ]; then
 fi
 
 # Nexus repository locations
-NPM_REGISTRY="http://${NEXUS_DOMAIN}:${NEXUS_PORT}/repository/npm-private/"
-PYPI_REGISTRY="http://${NEXUS_DOMAIN}:${NEXUS_PORT}/repository/pypi-private/"
-DOCKER_REGISTRY="${NEXUS_DOMAIN}:${NEXUS_DOCKER_PORT}"
+NPM_REGISTRY="http://${NEXUS_HOST}:${NEXUS_PORT}/repository/npm-private/"
+PYPI_REGISTRY="http://${NEXUS_HOST}:${NEXUS_PORT}/repository/pypi-private/"
+DOCKER_REGISTRY="${NEXUS_HOST}:${NEXUS_DOCKER_PORT}"
 
 # Setup directories with resources for docker, npm and pypi
 NXS_SRC_DOCKER_IMG_DIR="${DATA_DIR}/offline_data/docker_images_for_nexus"
@@ -267,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})"
@@ -274,26 +275,14 @@ 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 /etc/hosts
-HOSTS_BACKUP="$(eval ${TIMESTAMP}_hosts.bk)"
-cp /etc/hosts /etc/${HOSTS_BACKUP}
-
-# 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_PORT} -p ${NEXUS_DOCKER_PORT}:${NEXUS_DOCKER_PORT}"
-
-# Setup simulated domain names to be able to push all to private Nexus repository
-for DOCKER_IMG_LIST in "${NXS_DOCKER_IMG_LISTS[@]}"; do
-    simulated_hosts "${DOCKER_IMG_LIST}"
-done
+PUBLISHED_PORTS="-p ${NEXUS_PORT}:${NEXUS_EXPOSED_PORT} -p ${NEXUS_DOCKER_PORT}:${NEXUS_DOCKER_EXPOSED_PORT}"
 
 # Nexus repository configuration setup
 NEXUS_CONFIG_GROOVY='import org.sonatype.nexus.security.realm.RealmManager
@@ -378,15 +367,15 @@ INFO
 # Start the Nexus
 NEXUS_CONT_ID=$(docker run -d --rm -v ${NEXUS_DATA_DIR}:/nexus-data:rw --name ${NEXUS_DOMAIN} ${PUBLISHED_PORTS} ${NEXUS_IMAGE})
 echo "Waiting for Nexus to fully start"
-until curl -su ${NEXUS_USERNAME}:${NEXUS_PASSWORD} http://${NEXUS_DOMAIN}:${NEXUS_PORT}/service/metrics/healthcheck | grep '"healthy":true' > /dev/null ; do
+until curl -su ${NEXUS_USERNAME}:${NEXUS_PASSWORD} http://${NEXUS_HOST}:${NEXUS_PORT}/service/metrics/healthcheck | grep '"healthy":true' > /dev/null ; do
     printf "."
     sleep 3
 done
 echo -e "\nNexus started"
 
 # Configure the nexus repository
-curl -sX POST --header 'Content-Type: application/json' --data-binary "${NEXUS_CONFIG}" http://${NEXUS_USERNAME}:${NEXUS_PASSWORD}@${NEXUS_DOMAIN}:${NEXUS_PORT}/service/rest/v1/script
-curl -sX POST --header "Content-Type: text/plain" http://${NEXUS_USERNAME}:${NEXUS_PASSWORD}@${NEXUS_DOMAIN}:${NEXUS_PORT}/service/rest/v1/script/configure/run > /dev/null
+curl -sX POST --header 'Content-Type: application/json' --data-binary "${NEXUS_CONFIG}" http://${NEXUS_USERNAME}:${NEXUS_PASSWORD}@${NEXUS_HOST}:${NEXUS_PORT}/service/rest/v1/script
+curl -sX POST --header "Content-Type: text/plain" http://${NEXUS_USERNAME}:${NEXUS_PASSWORD}@${NEXUS_HOST}:${NEXUS_PORT}/service/rest/v1/script/configure/run > /dev/null
 
 ###########################
 # Populate NPM repository #
@@ -432,17 +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
 
-# Return backed up configuration files
-mv -f "/etc/${HOSTS_BACKUP}" /etc/hosts
-
-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