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-bump-chrome-and-chromedriver' into 'master'

Browse source 
Bump Chrome to V65 and upgrade Chromedriver 2.36

See merge request gitlab-org/gitlab-build-images!87
This commit is contained in:
Stan Hu 2018-04-08 06:36:40 +00:00
commit 9382570ab4
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -63,6 +63,7 @@ ruby-2.3-golang-1.10-git-2.16 test: *test_custom
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.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.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-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
golang-1.8.6-git-2.9.0 test: *test_custom golang-1.8.6-git-2.9.0 test: *test_custom
golang-1.8.6-git-2.14 test: *test_custom golang-1.8.6-git-2.14 test: *test_custom
golang-1.9-git-2.9.0 test: *test_custom golang-1.9-git-2.9.0 test: *test_custom

1
scripts/custom-docker-build
View file

@ -35,6 +35,7 @@ function print_chrome_args() {
62|62.0) CHROME_VERSION=62.0.3202.89-1 ;; 62|62.0) CHROME_VERSION=62.0.3202.89-1 ;;
63|63.0) CHROME_VERSION=63.0.3239.132-1 ;; 63|63.0) CHROME_VERSION=63.0.3239.132-1 ;;
64|64.0) CHROME_VERSION=64.0.3282.186-1 ;; 64|64.0) CHROME_VERSION=64.0.3282.186-1 ;;
65|65.0) CHROME_VERSION=65.0.3325.181-1 ;;
*) 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"

2
scripts/install-chrome
View file

@ -31,6 +31,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.35/chromedriver_linux64.zip wget -q https://chromedriver.storage.googleapis.com/2.36/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