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

Merge branch 'sh-update-chrome-98' into 'master'

Browse source 
Update to Chrome 98

See merge request gitlab-org/gitlab-build-images!487
This commit is contained in:
Stan Hu 2022-02-10 23:40:16 +00:00
commit 2a1adeeafe
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
.gitlab-matrix: .gitlab-matrix:
variables: variables:
LFS: '2.9' LFS: '2.9'
CHROME: '89' CHROME: '98'
NODE: '14.15' NODE: '14.15'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'

6
scripts/custom-docker-build
View file

@ -32,7 +32,7 @@ function print_golang_args() {
# If you add a new minor version here, be sure to check that the # If you add a new minor version here, be sure to check that the
# Chrome versions can be found at https://www.ubuntuupdates.org/pm/google-chrome-stable. # Chrome versions can be found at https://www.ubuntuupdates.org/pm/google-chrome-stable.
# ChromeDriver supports this: https://sites.google.com/a/chromium.org/chromedriver/downloads. # ChromeDriver supports this: https://sites.google.com/chromium.org/driver/downloads
# 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
@ -76,6 +76,10 @@ function print_chrome_args() {
CHROME_VERSION=89.0.4389.90-1 CHROME_VERSION=89.0.4389.90-1
CHROME_DRIVER_VERSION=89.0.4389.23 CHROME_DRIVER_VERSION=89.0.4389.23
;; ;;
98|98.0)
CHROME_VERSION=98.0.4758.80-1
CHROME_DRIVER_VERSION=98.0.4758.80
;;
*) echo "Unknown chrome version $1"; exit 1; *) echo "Unknown chrome version $1"; exit 1;
esac esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"