7 files changed, 18 insertions, 15 deletions
diff --git a/build/creating_data/download-git-repos.sh b/build/creating_data/download-git-repos.sh
index bb4a79f1..0219eb6f 100755
--- a/build/creating_data/download-git-repos.sh
+++ b/build/creating_data/download-git-repos.sh
@@ -24,7 +24,7 @@ usage () {
     echo "Usage:"
     echo -e "./$(basename $0) <repository list> [destination directory]\n"
     echo "Examples:"
-    echo "  ./$(basename $0) onap_3.0.0 ./git-repo"
+    echo "  ./$(basename $0) onap_3.0.0-git_repos.list ./git-repo"
 }
 
 LIST="${1}"
diff --git a/build/creating_data/save-docker-images.sh b/build/creating_data/save-docker-images.sh
index f4a5d3c7..4c764556 100755
--- a/build/creating_data/save-docker-images.sh
+++ b/build/creating_data/save-docker-images.sh
@@ -27,7 +27,8 @@ if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then
     . "${LOCAL_PATH}"/"${RELATIVE_PATH}"/common-functions.sh
 fi
 
-IMG_DIR="$1"
+LIST="${1}"
+IMG_DIR="${2}"
 
 if [[ -z "$IMG_DIR" ]]; then
     IMG_DIR="./images"
@@ -55,13 +56,11 @@ save_image() {
 
 echo "Save all images"
 line=1
-lines=$(docker images|grep -v 'IMAGE ID'|wc -l)
+lines=$(wc -l ${LIST})
 while read -r image; do
     echo "== pkg #$line of $lines =="
 
-    name=$(echo $image|awk '{print $1}')
-    tag=$(echo $image|awk '{print $2}')
-    save_image "$name:$tag"
+    save_image "${image}"
     line=$((line+1))
 
-done <<< "$(docker images|grep -v 'IMAGE ID'|awk '{printf("%s %s\n", $1, $2)}'|column -t)"
+done < "${LIST}"
diff --git a/build/data_lists/infra_docker_images.list b/build/data_lists/infra_docker_images.list
new file mode 100644
index 00000000..af156cfc
--- /dev/null
+++ b/build/data_lists/infra_docker_images.list
@@ -0,0 +1,3 @@
+andyshinn/dnsmasq:2.76
+consol/centos-icewm-vnc:latest
+sonatype/nexus3:3.15.2
diff --git a/build/data_lists/onap_3.0.0-docker_images.list b/build/data_lists/onap_3.0.0-docker_images.list
index 2bb8245d..589c6a51 100644
--- a/build/data_lists/onap_3.0.0-docker_images.list
+++ b/build/data_lists/onap_3.0.0-docker_images.list
@@ -2,7 +2,6 @@ aaionap/haproxy:1.2.4
 library/alpine:3.6
 library/busybox:latest
 library/cassandra:2.1
-consol/centos-icewm-vnc:latest
 library/consul:1.0.6
 crunchydata/crunchy-pgpool:centos7-10.4-2.0.0
 crunchydata/crunchy-postgres:centos7-10.3-1.8.2
diff --git a/build/data_lists/onap_3.0.1-docker_images.list b/build/data_lists/onap_3.0.1-docker_images.list
index cf8b11c6..ec98a3ed 100644
--- a/build/data_lists/onap_3.0.1-docker_images.list
+++ b/build/data_lists/onap_3.0.1-docker_images.list
@@ -3,7 +3,6 @@ library/alpine:3.6
 library/busybox:latest
 library/cassandra:2.1
 cdposs/zookeeper:3.4.9
-consol/centos-icewm-vnc:latest
 library/consul:1.0.6
 crunchydata/crunchy-pgpool:centos7-10.4-2.0.0
 crunchydata/crunchy-postgres:centos7-10.3-1.8.2
diff --git a/build/download_offline_data_by_lists.sh b/build/download_offline_data_by_lists.sh
index aede41dc..741c2046 100755
--- a/build/download_offline_data_by_lists.sh
+++ b/build/download_offline_data_by_lists.sh
@@ -47,7 +47,7 @@ fi
 CTOOLS="${LOCAL_PATH}/creating_data"
 LISTS_DIR="${LOCAL_PATH}/data_lists"
 DATA_DIR="${LOCAL_PATH}/../../resources"
-TOTAL=11
+TOTAL=12
 CURR=1
 
 message info "Downloading started: $(date)"
@@ -55,19 +55,22 @@ message info "Downloading started: $(date)"
 echo "[Step $((CURR++))/$TOTAL Download collected docker images]"
 $CTOOLS/download-docker-images.sh "${LISTS_DIR}/${TAG}-docker_images.list"
 
+echo "[Step $((CURR++))/$TOTAL Download docker images for infra-server]"
+$CTOOLS/download-docker-images.sh "${LISTS_DIR}/infra_docker_images.list"
+
 echo "[Step $((CURR++))/$TOTAL Build own nginx image]"
 $CTOOLS/create_nginx_image/01create-image.sh
 
 echo "[Step $((CURR++))/$TOTAL Save docker images from docker cache to tarfiles]"
-$CTOOLS/save-docker-images.sh "${DATA_DIR}/offline_data/docker_images_for_nexus"
+$CTOOLS/save-docker-images.sh "${LISTS_DIR}/${TAG}-docker_images.list" "${DATA_DIR}/offline_data/docker_images_for_nexus"
 
-echo "[Step $((CURR++))/$TOTAL move infra related images to infra folder]"
+echo "[Step $((CURR++))/$TOTAL Prepare infra related images to infra folder]"
 mkdir -p "${DATA_DIR}/offline_data/docker_images_infra"
 mv "${DATA_DIR}/offline_data/docker_images_for_nexus/own_nginx_latest.tar" "${DATA_DIR}/offline_data/docker_images_infra"
-mv "${DATA_DIR}/offline_data/docker_images_for_nexus/sonatype_nexus3_latest.tar" "${DATA_DIR}/offline_data/docker_images_infra"
+$CTOOLS/save-docker-images.sh "${LISTS_DIR}/infra_docker_images.list" "${DATA_DIR}/offline_data/docker_images_infra"
 
 echo "[Step $((CURR++))/$TOTAL Download git repos]"
-$CTOOLS/download-git-repos.sh "${LISTS_DIR}/${TAG}" "${DATA_DIR}/git-repo"
+$CTOOLS/download-git-repos.sh "${LISTS_DIR}/${TAG}-git_repos.list" "${DATA_DIR}/git-repo"
 
 echo "[Step $((CURR++))/$TOTAL Download http files]"
 $CTOOLS/download-http-files.sh "${LISTS_DIR}/${TAG}-http_files.list" "${DATA_DIR}/http"
diff --git a/build/fetch_and_patch_charts.sh b/build/fetch_and_patch_charts.sh
index cde42656..2c1312e0 100755
--- a/build/fetch_and_patch_charts.sh
+++ b/build/fetch_and_patch_charts.sh
@@ -37,7 +37,7 @@ C_='\033[0m'            #Color off
 usage () {
     echo "Usage:"
     echo -e "./$(basename $0) <helm charts repo> <commit/tag/branch> <patchfile> <target_dir>\n"
-    echo "Example: ./$(basename $0) https://gerrit.onap.org/r/oom 3.0.0-ONAP /root/offline-installer/patches/casablanca_3.0.0.patch /root/offline-installer/ansible/application/helm_charts"
+    echo "Example: ./$(basename $0) https://gerrit.onap.org/r/oom 3.0.0-ONAP /root/offline-installer/patches/casablanca.patch /root/offline-installer/ansible/application/helm_charts"
 }
 
 if [ "$#" -ne 4 ]; then