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

Merge branch 'vs/update-google-chrome' into 'master'

Browse source 
Update Google Chrome to 111

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

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Vitaly Slobodin <vslobodin@gitlab.com>
This commit is contained in:
Stan Hu 2023-03-20 15:48:02 +00:00
commit 013bf09f5c
3 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/kas.images.yml
View file

@ -15,7 +15,7 @@ gitlab-kas:
GOLANG: '1.19' GOLANG: '1.19'
RUST: '1.65' RUST: '1.65'
LFS: '2.9' LFS: '2.9'
CHROME: '107' CHROME: '111'
NODE: '14.15' NODE: '14.15'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'

2
scripts/install-chrome
View file

@ -74,7 +74,7 @@ function build_ubi() {
BUILD_OS=${BUILD_OS:-debian} BUILD_OS=${BUILD_OS:-debian}
OS_VERSION=${OS_VERSION:-bullseye} OS_VERSION=${OS_VERSION:-bullseye}
CHROME_VERSION=${1:-107.0.5304.87-1} CHROME_VERSION=${1:-111.0.5563.64-1}
CHROMIUM_VERSION=${2:-$CHROME_VERSION} CHROMIUM_VERSION=${2:-$CHROME_VERSION}
ARCH=${TARGETARCH:-amd64} ARCH=${TARGETARCH:-amd64}
PKG=$([ "${ARCH}" == "amd64" ] && echo "google-chrome-stable" || echo "chromium") PKG=$([ "${ARCH}" == "amd64" ] && echo "google-chrome-stable" || echo "chromium")

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

@ -73,18 +73,6 @@ function print_rust_args() {
# You may need to bump the version in scripts/install-chrome. # You may need to bump the version in scripts/install-chrome.
function print_chrome_args() { function print_chrome_args() {
case "$1" in case "$1" in
106|106.0)
CHROME_VERSION=106.0.5249.119-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
107|107.0)
CHROME_VERSION=107.0.5304.87-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
108|108.0)
CHROME_VERSION=108.0.5359.94-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
109|109.0) 109|109.0)
CHROME_VERSION=109.0.5414.119-1 CHROME_VERSION=109.0.5414.119-1
CHROMIUM_VERSION=109.0.5414.74-2 CHROMIUM_VERSION=109.0.5414.74-2
@ -93,6 +81,10 @@ function print_chrome_args() {
CHROME_VERSION=110.0.5481.177-1 CHROME_VERSION=110.0.5481.177-1
CHROMIUM_VERSION=$CHROME_VERSION CHROMIUM_VERSION=$CHROME_VERSION
;; ;;
111|111.0)
CHROME_VERSION=111.0.5563.64-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
*) fail "Unknown chrome version $1" ;; *) fail "Unknown chrome version $1" ;;
esac esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"