From c84a0a09226fb03fb8c9f2cf1de9750293e878a3 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Wed, 21 Apr 2021 02:21:24 +0000 Subject: [PATCH] Overhaul image for customers-gitlab-com Signed-off-by: Takuya Noguchi --- .gitlab-ci.yml | 4 ++-- scripts/custom-docker-build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04f94b8..5a219a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index a1f2d47..5f2adfd 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -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;