From a76708ffe91fdb5948e4fff036ca64d51af4de4e Mon Sep 17 00:00:00 2001 From: Vitaly Slobodin Date: Fri, 17 Mar 2023 09:38:42 +0100 Subject: [PATCH 1/5] Remove Google Chrome 106 --- scripts/lib/custom-docker-build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 84990cd..6d0cd6b 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -73,10 +73,6 @@ function print_rust_args() { # You may need to bump the version in scripts/install-chrome. function print_chrome_args() { 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 From 6bfdad143fbf71eded76502e59017eacc6c7c8fb Mon Sep 17 00:00:00 2001 From: Vitaly Slobodin Date: Fri, 17 Mar 2023 09:38:50 +0100 Subject: [PATCH 2/5] Remove Google Chrome 107 --- scripts/lib/custom-docker-build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 6d0cd6b..c355bbc 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -73,10 +73,6 @@ function print_rust_args() { # You may need to bump the version in scripts/install-chrome. function print_chrome_args() { case "$1" in - 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 From dc40eb856c834fc0a74158d52e8d154edc0a9341 Mon Sep 17 00:00:00 2001 From: Vitaly Slobodin Date: Fri, 17 Mar 2023 09:38:58 +0100 Subject: [PATCH 3/5] Remove Google Chrome 108 --- scripts/lib/custom-docker-build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index c355bbc..8e2607c 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -73,10 +73,6 @@ function print_rust_args() { # You may need to bump the version in scripts/install-chrome. function print_chrome_args() { case "$1" in - 108|108.0) - CHROME_VERSION=108.0.5359.94-1 - CHROMIUM_VERSION=$CHROME_VERSION - ;; 109|109.0) CHROME_VERSION=109.0.5414.119-1 CHROMIUM_VERSION=109.0.5414.74-2 From b28ccd8306766dd6799b70800bfbd36ea3dd9b20 Mon Sep 17 00:00:00 2001 From: Vitaly Slobodin Date: Fri, 17 Mar 2023 09:39:04 +0100 Subject: [PATCH 4/5] Add Google Chrome 111 --- scripts/install-chrome | 2 +- scripts/lib/custom-docker-build | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/install-chrome b/scripts/install-chrome index 59a3d2e..3a204c7 100755 --- a/scripts/install-chrome +++ b/scripts/install-chrome @@ -74,7 +74,7 @@ function build_ubi() { BUILD_OS=${BUILD_OS:-debian} 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} ARCH=${TARGETARCH:-amd64} PKG=$([ "${ARCH}" == "amd64" ] && echo "google-chrome-stable" || echo "chromium") diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 8e2607c..4a0e08b 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -81,6 +81,10 @@ function print_chrome_args() { CHROME_VERSION=110.0.5481.177-1 CHROMIUM_VERSION=$CHROME_VERSION ;; + 111|111.0) + CHROME_VERSION=111.0.5563.64-1 + CHROMIUM_VERSION=$CHROME_VERSION + ;; *) fail "Unknown chrome version $1" ;; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" From 153ff3c2cf2f1d076ebdb2de893eca31a4e1ec04 Mon Sep 17 00:00:00 2001 From: Vitaly Slobodin Date: Fri, 17 Mar 2023 09:40:54 +0100 Subject: [PATCH 5/5] Bump Google Chrome in KAS from 107 to 111 --- .gitlab/ci/kas.images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/kas.images.yml b/.gitlab/ci/kas.images.yml index f1a5e0f..8e37b23 100644 --- a/.gitlab/ci/kas.images.yml +++ b/.gitlab/ci/kas.images.yml @@ -15,7 +15,7 @@ gitlab-kas: GOLANG: '1.19' RUST: '1.65' LFS: '2.9' - CHROME: '107' + CHROME: '111' NODE: '14.15' YARN: '1.22' GRAPHICSMAGICK: '1.3.36'