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-upgrade-ruby-2-6-3-for-www-gitlab-com' into 'master'

Browse source 
Upgrade www-gitlab-com dependencies

See merge request gitlab-org/gitlab-build-images!188
This commit is contained in:
Stan Hu 2019-06-07 18:30:41 +00:00
commit 29956e7940
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -71,6 +71,7 @@ ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom
ruby-2.6.3-git-2.21-chrome-74.0-docker-18.06.1 test: *test_custom
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
@ -118,6 +119,7 @@ ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom
ruby-2.6.3-git-2.21-chrome-74.0-docker-18.06.1: *build_and_deploy_custom
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom

4
scripts/custom-docker-build
View file

@ -46,6 +46,10 @@ function print_chrome_args() {
CHROME_VERSION=73.0.3683.103-1 CHROME_VERSION=73.0.3683.103-1
CHROME_DRIVER_VERSION=73.0.3683.68 CHROME_DRIVER_VERSION=73.0.3683.68
;; ;;
74|74.0)
CHROME_VERSION=74.0.3729.169-1
CHROME_DRIVER_VERSION=74.0.3729.6
;;
*) 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"