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 'ddieulivol-reuse_debian_chrome_packages_for_all_os' into 'master'

Browse source 
Use regular OS when using slim container image

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

Merged-by: Andrejs Cunskis <acunskis@gitlab.com>
Approved-by: Andrejs Cunskis <acunskis@gitlab.com>
Co-authored-by: ddieulivol <ddieulivol@gitlab.com>
This commit is contained in:
Andrejs Cunskis 2023-09-20 05:20:31 +00:00
commit ed5d1b2687
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/install-chrome
View file

@ -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}