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

Merge branch 'acunskis-automated-chromedriver-version' into 'master'

Browse source 
Automaticaly fetch chromedriver version based on chrome

See merge request gitlab-org/gitlab-build-images!558
This commit is contained in:
Stan Hu 2022-07-05 16:43:08 +00:00
commit 2432db6c3f
4 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ gitlab:
POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.17', '1.18']
NODE: ['16.14']
CHROME: ['94', '101']
CHROME: ['99', '101']
# Used by GitLab's compile-production-assets and compile-test-assets jobs
gitlab-assets:

3
Dockerfile.custom
View file

@ -35,9 +35,8 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
# Chrome
ARG CHROME_VERSION
ARG CHROME_DRIVER_VERSION
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION $CHROME_DRIVER_VERSION && ( google-chrome --version || chromium --version ); fi
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION && ( google-chrome --version || chromium --version ); fi
# NodeJS and Yarn
ARG NODE_INSTALL_VERSION

3
scripts/install-chrome
View file

@ -15,7 +15,6 @@ function build_debian() {
fi
CHROME_VERSION=${1:-99.0.4844.74-1}
CHROME_DRIVER_VERSION=${2:-99.0.4844.51}
# We hard code the URL rather than using $CI_API_V4_URL $CI_PROJECT_ID,
# because we would need to forward those variables
CHROME_DOWNLOAD_URL_BASE="https://gitlab.com/api/v4/projects/1075790/packages/generic/google-chrome-stable"
@ -48,6 +47,8 @@ fi
rm -rf /var/lib/apt/lists/*
# Install ChromeDriver
CHROME_VERSION_BASE=$(echo $CHROME_VERSION | awk -F "." '{print $1 "." $2 "." $3}')
CHROME_DRIVER_VERSION=$(curl -q https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION_BASE)
wget -q https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip
unzip chromedriver_linux64.zip -d /usr/local/bin
rm -f chromedriver_linux64.zip

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

@ -45,26 +45,18 @@ function print_golang_args() {
# You may need to bump the version in scripts/install-chrome.
function print_chrome_args() {
case "$1" in
94|94.0)
CHROME_VERSION=94.0.4606.81-1
CHROME_DRIVER_VERSION=94.0.4606.113
;;
97|97.0)
CHROME_VERSION=97.0.4692.99-1
CHROME_DRIVER_VERSION=97.0.4692.71
;;
99|99.0)
CHROME_VERSION=99.0.4844.74-1
CHROME_DRIVER_VERSION=99.0.4844.51
;;
101|101.0)
CHROME_VERSION=101.0.4951.64-1
CHROME_DRIVER_VERSION=101.0.4951.41
;;
103|103.0)
CHROME_VERSION=103.0.5060.53-1
;;
*) echo "Unknown chrome version $1"; exit 1;
esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"
printf -- "--build-arg CHROME_DRIVER_VERSION=%s " "$CHROME_DRIVER_VERSION"
}
# see https://www.kernel.org/pub/software/scm/git