From 80a6ffeb18ff7bdd3b139d32d3637195d6cdc5ab Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Sat, 2 Nov 2024 23:36:26 -0400 Subject: [PATCH] docker_image_builder fix --- build/docker_images_builder.sh | 13 ++++++++----- release_version.txt | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build/docker_images_builder.sh b/build/docker_images_builder.sh index c6aea2b..d10d379 100755 --- a/build/docker_images_builder.sh +++ b/build/docker_images_builder.sh @@ -1,6 +1,5 @@ #!/bin/bash - usage() { echo -n "Usage: ${0} " echo @@ -49,7 +48,7 @@ build_docker_image() { image_version=$(get_latest_dist_version ${project}) if [ -z "${image_version}" ]; then echo "No latest version found for ${project}" - exit 1 + return fi echo "Latest version is ${image_version}" @@ -141,10 +140,8 @@ image_exists() { print_all_reg_images() { project=${1} - # Fetch all repositories (images) from the registry repositories=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/_catalog" | jq -r '.repositories[]') - # Iterate over each repository to get its tags for repo in $repositories; do # Fetch all tags for the repository tags=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/$repo/tags/list" | jq -r '.tags[]') @@ -178,12 +175,18 @@ eval ${Cmd} convert_symlink_to_dir docker_dev -echo "${DIMAGES_CONFIG}" | jq -c 'to_entries[]' | while IFS= read -r item; do +Jobs=() +while IFS= read -r item; do + Jobs+=("$item") +done < <(echo "${DIMAGES_CONFIG}" | jq -c 'to_entries[]') + +for item in "${Jobs[@]}"; do # Extract key (name) and values title=$(echo "$item" | jq -r '.key') image_name=$(echo "$item" | jq -r '.value.image_name') docker_dev_path=$(echo "$item" | jq -r '.value.docker_dev_path') project=$(echo "$item" | jq -r '.value.based_on_project') + build_docker_image "$title" "$image_name" "$docker_dev_path" "$project" done diff --git a/release_version.txt b/release_version.txt index 315985f..a805dad 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.8.5,docker_image_builder +1.8.5.fx1,docker_image_builder