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

Merge branch 'sh-update-chromedriver-2.31' into 'master'

Browse source 
Update Chrome to 60.0 and ChromeDriver to 2.31

See merge request !49
This commit is contained in:
Stan Hu 2017-08-03 00:37:26 +00:00
commit 2e43cb6259
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -32,7 +32,7 @@ ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 test: *test_build ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 test: *test_build ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6 test: *test_build ruby-2.3.3-golang-1.8-git-2.7-chrome-60.0-node-7.1-postgresql-9.6 test: *test_build
ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
www-gitlab-com test: *test_build www-gitlab-com test: *test_build
doc-gitlab-com test: *test_build doc-gitlab-com test: *test_build
@ -55,7 +55,7 @@ ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy
ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6: *build_and_deploy ruby-2.3.3-golang-1.8-git-2.7-chrome-60.0-node-7.1-postgresql-9.6: *build_and_deploy
ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy
www-gitlab-com: *build_and_deploy www-gitlab-com: *build_and_deploy
doc-gitlab-com: *build_and_deploy doc-gitlab-com: *build_and_deploy

0
Dockerfile.ruby-2.3.3-golang-1.8-git-2.7-chrome-59.0-node-7.1-postgresql-9.6 → Dockerfile.ruby-2.3.3-golang-1.8-git-2.7-chrome-60.0-node-7.1-postgresql-9.6
View file

4
scripts/install-chrome
View file

@ -2,7 +2,7 @@
set -xeo pipefail set -xeo pipefail
CHROME_VERSION=${1:-59.0.3071.104-1} CHROME_VERSION=${1:-60.0.3112.90-1}
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 -
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
@ -12,6 +12,6 @@ env DEBIAN_FRONTEND="noninteractive" apt-get install -y google-chrome-stable=$CH
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Install ChromeDriver # Install ChromeDriver
wget -q https://chromedriver.storage.googleapis.com/2.30/chromedriver_linux64.zip wget -q https://chromedriver.storage.googleapis.com/2.31/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