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

Merge branch 'fix-image-names' into 'master'

Browse source 
Fix duplicate `debian-bullseye` in image name

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/596

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Rémy Coutable <remy@rymai.me>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Kamil Trzciński <ayufan@ayufan.eu>
This commit is contained in:
Stan Hu 2022-10-28 14:34:00 +00:00
commit c264fc6b62
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
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"
}
# Use DEBIAN by default unless specified otherwise
DEBIAN=${DEBIAN:-bullseye}
# 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}
fi
build_custom_if_needed $@