docker_image_builder fix
This commit is contained in:
parent
e7c02587c2
commit
80a6ffeb18
@ -1,6 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo -n "Usage: ${0} <RootDir>"
|
echo -n "Usage: ${0} <RootDir>"
|
||||||
echo
|
echo
|
||||||
@ -49,7 +48,7 @@ build_docker_image() {
|
|||||||
image_version=$(get_latest_dist_version ${project})
|
image_version=$(get_latest_dist_version ${project})
|
||||||
if [ -z "${image_version}" ]; then
|
if [ -z "${image_version}" ]; then
|
||||||
echo "No latest version found for ${project}"
|
echo "No latest version found for ${project}"
|
||||||
exit 1
|
return
|
||||||
fi
|
fi
|
||||||
echo "Latest version is ${image_version}"
|
echo "Latest version is ${image_version}"
|
||||||
|
|
||||||
@ -141,10 +140,8 @@ image_exists() {
|
|||||||
print_all_reg_images() {
|
print_all_reg_images() {
|
||||||
project=${1}
|
project=${1}
|
||||||
|
|
||||||
# Fetch all repositories (images) from the registry
|
|
||||||
repositories=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/_catalog" | jq -r '.repositories[]')
|
repositories=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/_catalog" | jq -r '.repositories[]')
|
||||||
|
|
||||||
# Iterate over each repository to get its tags
|
|
||||||
for repo in $repositories; do
|
for repo in $repositories; do
|
||||||
# Fetch all tags for the repository
|
# Fetch all tags for the repository
|
||||||
tags=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/$repo/tags/list" | jq -r '.tags[]')
|
tags=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/$repo/tags/list" | jq -r '.tags[]')
|
||||||
@ -178,12 +175,18 @@ eval ${Cmd}
|
|||||||
|
|
||||||
convert_symlink_to_dir docker_dev
|
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
|
# Extract key (name) and values
|
||||||
title=$(echo "$item" | jq -r '.key')
|
title=$(echo "$item" | jq -r '.key')
|
||||||
image_name=$(echo "$item" | jq -r '.value.image_name')
|
image_name=$(echo "$item" | jq -r '.value.image_name')
|
||||||
docker_dev_path=$(echo "$item" | jq -r '.value.docker_dev_path')
|
docker_dev_path=$(echo "$item" | jq -r '.value.docker_dev_path')
|
||||||
project=$(echo "$item" | jq -r '.value.based_on_project')
|
project=$(echo "$item" | jq -r '.value.based_on_project')
|
||||||
|
|
||||||
build_docker_image "$title" "$image_name" "$docker_dev_path" "$project"
|
build_docker_image "$title" "$image_name" "$docker_dev_path" "$project"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
1.8.5,docker_image_builder
|
1.8.5.fx1,docker_image_builder
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user