mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-10 02:22:57 +01:00
Automaticaly fetch chromedriver version based on chrome
This commit is contained in:
parent
0a603faec2
commit
f71fe0261d
3 changed files with 29 additions and 34 deletions
|
|
@ -35,9 +35,8 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
|
||||||
|
|
||||||
# Chrome
|
# Chrome
|
||||||
ARG CHROME_VERSION
|
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
|
# NodeJS and Yarn
|
||||||
ARG NODE_INSTALL_VERSION
|
ARG NODE_INSTALL_VERSION
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ function build_debian() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CHROME_VERSION=${1:-99.0.4844.74-1}
|
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,
|
# We hard code the URL rather than using $CI_API_V4_URL $CI_PROJECT_ID,
|
||||||
# because we would need to forward those variables
|
# because we would need to forward those variables
|
||||||
CHROME_DOWNLOAD_URL_BASE="https://gitlab.com/api/v4/projects/1075790/packages/generic/google-chrome-stable"
|
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/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Install ChromeDriver
|
# 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
|
wget -q https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip
|
||||||
unzip chromedriver_linux64.zip -d /usr/local/bin
|
unzip chromedriver_linux64.zip -d /usr/local/bin
|
||||||
rm -f chromedriver_linux64.zip
|
rm -f chromedriver_linux64.zip
|
||||||
|
|
|
||||||
|
|
@ -47,24 +47,19 @@ function print_chrome_args() {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
94|94.0)
|
94|94.0)
|
||||||
CHROME_VERSION=94.0.4606.81-1
|
CHROME_VERSION=94.0.4606.81-1
|
||||||
CHROME_DRIVER_VERSION=94.0.4606.113
|
|
||||||
;;
|
;;
|
||||||
97|97.0)
|
97|97.0)
|
||||||
CHROME_VERSION=97.0.4692.99-1
|
CHROME_VERSION=97.0.4692.99-1
|
||||||
CHROME_DRIVER_VERSION=97.0.4692.71
|
|
||||||
;;
|
;;
|
||||||
99|99.0)
|
99|99.0)
|
||||||
CHROME_VERSION=99.0.4844.74-1
|
CHROME_VERSION=99.0.4844.74-1
|
||||||
CHROME_DRIVER_VERSION=99.0.4844.51
|
|
||||||
;;
|
;;
|
||||||
101|101.0)
|
101|101.0)
|
||||||
CHROME_VERSION=101.0.4951.64-1
|
CHROME_VERSION=101.0.4951.64-1
|
||||||
CHROME_DRIVER_VERSION=101.0.4951.41
|
|
||||||
;;
|
;;
|
||||||
*) 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"
|
||||||
printf -- "--build-arg CHROME_DRIVER_VERSION=%s " "$CHROME_DRIVER_VERSION"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# see https://www.kernel.org/pub/software/scm/git
|
# see https://www.kernel.org/pub/software/scm/git
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue