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

Fix duplicate debian-bullseye in image name

Browse source 
This is due to usage of OS and DEBIAN in a CI.
Ignore DEBIAN/UBI if OS is specified.
This commit is contained in:
Kamil Trzciński 2022-10-28 13:08:27 +02:00
parent fcf4b14618
commit 5cbbafa65e
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/lib/custom-docker-build
View file

@ -389,7 +389,14 @@ function build_custom_if_needed() {
printf "\n\nSUCCESS - Successfully built:\n\t%s\n" "$full_image_name" printf "\n\nSUCCESS - Successfully built:\n\t%s\n" "$full_image_name"
} }
# Use DEBIAN by default unless specified otherwise # If OS is specified ignore other ways to specify system
# Use DEBIAN if UBI is not specified
if [[ -n "$OS" ]]; then
unset DEBIAN UBI
elif [[ -n "$UBI" ]]; then
unset DEBIAN
else
DEBIAN=${DEBIAN:-bullseye} DEBIAN=${DEBIAN:-bullseye}
fi
build_custom_if_needed $@ build_custom_if_needed $@