From e0189351acce962069eb99c49c3521389ddd161a Mon Sep 17 00:00:00 2001 From: David Dieulivol Date: Wed, 20 Sep 2023 05:20:31 +0000 Subject: [PATCH] Use regular OS when using slim container image --- scripts/install-chrome | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/install-chrome b/scripts/install-chrome index 3a204c7..cfc3da8 100755 --- a/scripts/install-chrome +++ b/scripts/install-chrome @@ -74,6 +74,14 @@ function build_ubi() { BUILD_OS=${BUILD_OS:-debian} OS_VERSION=${OS_VERSION:-bullseye} + +# When using a -slim version, actually use the non-slim OS version. +# +# See https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/729#note_1564796274 +if [[ $OS_VERSION =~ .+-slim ]]; then + OS_VERSION=${OS_VERSION%%-slim} +fi + CHROME_VERSION=${1:-111.0.5563.64-1} CHROMIUM_VERSION=${2:-$CHROME_VERSION} ARCH=${TARGETARCH:-amd64}