diff options
| -rwxr-xr-x | build/creating_data/save-docker-images.sh | 11 | ||||
| -rwxr-xr-x | build/download_offline_data_by_lists.sh | 2 |
2 files changed, 6 insertions, 7 deletions
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/download_offline_data_by_lists.sh b/build/download_offline_data_by_lists.sh index b7acb4a5..5555d207 100755 --- a/build/download_offline_data_by_lists.sh +++ b/build/download_offline_data_by_lists.sh @@ -59,7 +59,7 @@ 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]" mkdir -p "${DATA_DIR}/offline_data/docker_images_infra" |