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

Bump to Chrome V66 and tie ChromeDriver version to each version of Chrome

Browse source
This commit is contained in:
Stan Hu 2018-05-19 05:58:22 -07:00
parent 074863eb8c
commit 6c649b55fb
4 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -64,10 +64,8 @@ ruby-2.4-golang-1.10-git-2.16 test: *test_custom
ruby-2.4-golang-1.10-git-2.17 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 # 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.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.3.7-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.4.1-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.4.1-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
# Not used anymore (?) # Not used anymore (?)
@ -113,10 +111,8 @@ ruby-2.4-golang-1.9-git-2.17: *build_and_deploy_custom
ruby-2.4-golang-1.10-git-2.17: *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 # 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.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.3.7-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.4.1-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.1-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?) # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)

3
Dockerfile.custom
View file

@ -21,7 +21,8 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi
# Chrome # Chrome
ARG CHROME_VERSION 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 # PhantomJS
ARG PHANTOMJS_VERSION ARG PHANTOMJS_VERSION

34
scripts/custom-docker-build
View file

@ -30,12 +30,34 @@ function print_golang_args() {
# 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
60|60.0) CHROME_VERSION=60.0.3112.90-1 ;; 60|60.0)
61|61.0) CHROME_VERSION=61.0.3163.100-1 ;; CHROME_VERSION=60.0.3112.90-1
62|62.0) CHROME_VERSION=62.0.3202.89-1 ;; CHROME_DRIVER_VERSION=2.33
63|63.0) CHROME_VERSION=63.0.3239.132-1 ;; ;;
64|64.0) CHROME_VERSION=64.0.3282.186-1 ;; 61|61.0)
65|65.0) CHROME_VERSION=65.0.3325.181-1 ;; 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.38
;;
*) 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"

5
scripts/install-chrome
View file

@ -3,7 +3,8 @@
set -xeuo pipefail set -xeuo pipefail
IFS=$'\n\t' 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 export DEBIAN_FRONTEND=noninteractive
curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add - 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/* rm -rf /var/lib/apt/lists/*
# Install ChromeDriver # 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 unzip chromedriver_linux64.zip -d /usr/local/bin
rm -f chromedriver_linux64.zip rm -f chromedriver_linux64.zip