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

Fix OS detection in custom-docker-build

Browse source 
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2022-07-05 11:13:47 +02:00
parent 0a603faec2
commit d3aafec77f
No known key found for this signature in database
GPG key ID: 4C514D15D07186F1
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,16 @@ function get_base_image_reference() {
fi fi
} }
function print_os_args() {
CUSTOM_BASE_IMAGE=get_base_image_reference "$1"
if [ -z "$CUSTOM_BASE_IMAGE" ]; then
CUSTOM_BASE_IMAGE="$CUSTOM_DOCKER_ARCH/debian:buster"
fi
printf -- "--build-arg CUSTOM_BASE_IMAGE=%s " "$CUSTOM_BASE_IMAGE"
}
function print_golang_args() { function print_golang_args() {
declare -A GOLANG_DOWNLOAD_SHA256 declare -A GOLANG_DOWNLOAD_SHA256
@ -334,7 +344,7 @@ function parse_arguments() {
version="${!tool}" version="${!tool}"
case "$tool" in case "$tool" in
ARCH) CUSTOM_DOCKER_ARCH=$version ;; ARCH) CUSTOM_DOCKER_ARCH=$version ;;
OS) CUSTOM_BASE_IMAGE=get_base_image_reference $version ;; OS) print_os_args $version ;;
RUBY) print_ruby_args $version ;; RUBY) print_ruby_args $version ;;
BUNDLER) print_bundler_args $version ;; BUNDLER) print_bundler_args $version ;;
RUBYGEMS) print_rubygems_args $version ;; RUBYGEMS) print_rubygems_args $version ;;
@ -357,12 +367,6 @@ function parse_arguments() {
esac esac
fi fi
done done
if [ -z "$CUSTOM_BASE_IMAGE" ]; then
CUSTOM_BASE_IMAGE="$CUSTOM_DOCKER_ARCH/debian:buster"
fi
printf -- "--build-arg CUSTOM_BASE_IMAGE=%s " "$CUSTOM_BASE_IMAGE"
} }
function generate_command() { function generate_command() {