NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly set tag for images without minor tools

Browse source
This commit is contained in:
Andrejs Cunskis 2022-05-03 14:15:31 +03:00
parent 8fff315864
commit 8b1b51a97c
No known key found for this signature in database
GPG key ID: 87CB75083F227241
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/custom-docker-build
View file

@ -344,6 +344,7 @@ function build_custom_if_needed() {
printf "\t%s" "$docker_command" printf "\t%s" "$docker_command"
eval $docker_command eval $docker_command
printf "\n\nSUCCESS - Successfully built:\n\t%s" "$full_image_name" printf "\n\nSUCCESS - Successfully built:\n\t%s" "$full_image_name"
echo ""
} }
build_custom_if_needed $@ build_custom_if_needed $@

7
scripts/lib/custom-docker.sh
View file

@ -25,5 +25,10 @@ function get_image_tag() {
tag="${tag}-${tool,,}-${!tool}" tag="${tag}-${tool,,}-${!tool}"
fi fi
done done
echo "${tag:1}"
if [[ -n "$tag" ]]; then
echo "${tag:1}"
else
echo "latest"
fi
} }