mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Merge branch 'sh-bump-chrome-and-chromedriver-v66' into 'master'
Bump to Chrome V66 and tie ChromeDriver version to each version of Chrome See merge request gitlab-org/gitlab-build-images!94
This commit is contained in:
Stan Hu
commit
ade5adcc54
4 changed files with 41 additions and 17 deletions
|
|
@ -70,12 +70,10 @@ ruby-2.4-golang-1.10-git-2.16 test: *test_custom
|
|||
ruby-2.4-golang-1.10-git-2.17 test: *test_custom
|
||||
|
||||
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
|
||||
ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||
ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||
ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||
ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
|
||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
|
||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
|
||||
|
||||
# Not used anymore (?)
|
||||
golang-1.9-git-2.9.0 test: *test_custom
|
||||
|
|
@ -126,12 +124,10 @@ ruby-2.4-golang-1.10-git-2.16: *build_and_deploy_custom
|
|||
ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom
|
||||
|
||||
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
|
||||
ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||
ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||
ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||
ruby-2.3.7-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
|
||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
|
||||
ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
|
||||
|
||||
# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
|
||||
node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
|
|||
|
||||
# Chrome
|
||||
ARG CHROME_VERSION
|
||||
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION && google-chrome --version; fi
|
||||
ARG CHROME_DRIVER_VERSION
|
||||
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION $CHROME_DRIVER_VERSION && google-chrome --version; fi
|
||||
|
||||
# PhantomJS
|
||||
ARG PHANTOMJS_VERSION
|
||||
|
|
|
|||
|
|
@ -30,12 +30,38 @@ function print_golang_args() {
|
|||
# You may need to bump the version in scripts/install-chrome.
|
||||
function print_chrome_args() {
|
||||
case "$1" in
|
||||
60|60.0) CHROME_VERSION=60.0.3112.90-1 ;;
|
||||
61|61.0) CHROME_VERSION=61.0.3163.100-1 ;;
|
||||
62|62.0) CHROME_VERSION=62.0.3202.89-1 ;;
|
||||
63|63.0) CHROME_VERSION=63.0.3239.132-1 ;;
|
||||
64|64.0) CHROME_VERSION=64.0.3282.186-1 ;;
|
||||
65|65.0) CHROME_VERSION=65.0.3325.181-1 ;;
|
||||
60|60.0)
|
||||
CHROME_VERSION=60.0.3112.90-1
|
||||
CHROME_DRIVER_VERSION=2.33
|
||||
;;
|
||||
61|61.0)
|
||||
CHROME_VERSION=61.0.3163.100-1
|
||||
CHROME_DRIVER_VERSION=2.34
|
||||
;;
|
||||
62|62.0)
|
||||
CHROME_VERSION=62.0.3202.89-1
|
||||
CHROME_DRIVER_VERSION=2.35
|
||||
;;
|
||||
63|63.0)
|
||||
CHROME_VERSION=63.0.3239.132-1
|
||||
CHROME_DRIVER_VERSION=2.36
|
||||
;;
|
||||
64|64.0)
|
||||
CHROME_VERSION=64.0.3282.186-1
|
||||
CHROME_DRIVER_VERSION=2.36
|
||||
;;
|
||||
65|65.0)
|
||||
CHROME_VERSION=65.0.3325.181-1
|
||||
CHROME_DRIVER_VERSION=2.36
|
||||
;;
|
||||
66|66.0)
|
||||
CHROME_VERSION=66.0.3359.181-1
|
||||
CHROME_DRIVER_VERSION=2.40
|
||||
;;
|
||||
67|67.0)
|
||||
CHROME_VERSION=67.0.3396.79-1
|
||||
CHROME_DRIVER_VERSION=2.40
|
||||
;;
|
||||
*) echo "Unknown chrome version $1"; exit 1;
|
||||
esac
|
||||
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
set -xeuo pipefail
|
||||
IFS=$'\n\t'
|
||||
|
||||
CHROME_VERSION=${1:-60.0.3112.90-1}
|
||||
CHROME_VERSION=${1:-66.0.3359.181-1}
|
||||
CHROME_DRIVER_VERSION=${2:-2.38}
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
|
||||
|
|
@ -31,6 +32,6 @@ fi
|
|||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install ChromeDriver
|
||||
wget -q https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue