diff options
author | 2019-03-04 13:34:41 +0000 | |
---|---|---|
committer | 2019-03-04 13:34:41 +0000 | |
commit | 1fa643c880dc4e59c1a8fe2c0e3350a7ba44ea00 (patch) | |
tree | da62f752b1091f79a4738c7d1f8bdbdc52ecb5e4 | |
parent | 01406c1085b585550f1e0294d35a9a52bcd43656 (diff) | |
parent | 0dd8f4447b714a12315edd8c0a13ae0df40653a2 (diff) |
Merge "Download of infra related docker images"
-rw-r--r-- | build/data_lists/infra_docker_images.list | 3 | ||||
-rw-r--r-- | build/data_lists/onap_3.0.0-docker_images.list | 1 | ||||
-rw-r--r-- | build/data_lists/onap_3.0.1-docker_images.list | 1 | ||||
-rwxr-xr-x | build/download_offline_data_by_lists.sh | 9 |
4 files changed, 9 insertions, 5 deletions
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 5555d207..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,16 +55,19 @@ 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 "${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}-git_repos.list" "${DATA_DIR}/git-repo" |