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 'customers-gitlab-com' into 'master'

Browse source 
Overhaul image for customers-gitlab-com

See merge request gitlab-org/gitlab-build-images!396
This commit is contained in:
Rémy Coutable 2021-04-22 10:36:55 +00:00
commit 351ef2e34a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -97,7 +97,7 @@ ruby-2.7.2-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *te
ruby-3.0.0-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 test: *test_custom
# Used by customers-gitlab-com rspec job: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab-ci.yml
ruby-2.6.6-golang-1.14-git-2.31-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36: *test_custom
ruby-2.6.6-git-2.31-lfs-2.9-chrome-89-node-12.22-yarn-1.22-postgresql-9.5: *test_custom
danger test: *test_build
alpine-helm test: *test_build
@ -159,7 +159,7 @@ ruby-2.7.2-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *bu
ruby-3.0.0-git-2.31-lfs-2.9-node-14.15-yarn-1.22-graphicsmagick-1.3.36 push: *build_and_deploy_custom
# Used by customers-gitlab-com rspec job: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab-ci.yml
ruby-2.6.6-golang-1.14-git-2.31-lfs-2.9-chrome-81.0-node-12.18-yarn-1.21-postgresql-9.5-graphicsmagick-1.3.36 push: *build_and_deploy_custom
ruby-2.6.6-git-2.31-lfs-2.9-chrome-89-node-12.22-yarn-1.22-postgresql-9.5 push: *build_and_deploy_custom
danger push: *build_and_deploy
alpine-helm push: *build_and_deploy

2
scripts/custom-docker-build
View file

@ -123,7 +123,7 @@ function print_node_args() {
8|8.x) NODE_INSTALL_VERSION=8.16.0 ;;
10|10.x) NODE_INSTALL_VERSION=10.16.0 ;;
12|12.x) NODE_INSTALL_VERSION=12.4.0 ;;
12.18) NODE_INSTALL_VERSION=12.18.4 ;;
12.22) NODE_INSTALL_VERSION=12.22.1 ;;
14.15) NODE_INSTALL_VERSION=14.15.4 ;;
14|14.16) NODE_INSTALL_VERSION=14.16.0 ;;
*) echo "Unknown node version $1"; exit 1;