From edbe08f36031c3f17550f9911df477c55682b754 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 7 Mar 2022 11:25:28 -0800 Subject: [PATCH] Update nodejs to v16.14.0 This matches the update in https://gitlab.com/gitlab-com/www-gitlab-com/-/merge_requests/99215. This also renames the image from `www-gitlab-com-3.0` to `www-gitlab-com-ruby-3.0-node-16` to make it possible to roll this change out properly. --- .gitlab/ci/custom.images.yml | 4 ++-- ...tlab-com-3.0 => Dockerfile.www-gitlab-com-ruby-3.0-node-16 | 0 scripts/install-www-gitlab-com | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename Dockerfile.www-gitlab-com-3.0 => Dockerfile.www-gitlab-com-ruby-3.0-node-16 (100%) diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml index 1fd9ce4..fdcab80 100644 --- a/.gitlab/ci/custom.images.yml +++ b/.gitlab/ci/custom.images.yml @@ -49,7 +49,7 @@ release-tools test: *test_build triage-ops-ruby-2.7 test: *test_build sitespeed-gitlab test: *test_build ubi-release test: *test_build -www-gitlab-com-3.0 test: *test_build +www-gitlab-com-ruby-3.0-node-16 test: *test_build build-git: *test_build # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/-/blob/13-8-stable-ee/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml terraform test: *test_build @@ -95,7 +95,7 @@ release-tools push: *build_and_deploy triage-ops-ruby-2.7 push: *build_and_deploy sitespeed-gitlab push: *build_and_deploy ubi-release push: *build_and_deploy -www-gitlab-com-3.0 push: *build_and_deploy +www-gitlab-com-ruby-3.0-node-16 push: *build_and_deploy build-git push: *build_and_deploy # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/-/blob/13-8-stable-ee/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml terraform push: *build_and_deploy diff --git a/Dockerfile.www-gitlab-com-3.0 b/Dockerfile.www-gitlab-com-ruby-3.0-node-16 similarity index 100% rename from Dockerfile.www-gitlab-com-3.0 rename to Dockerfile.www-gitlab-com-ruby-3.0-node-16 diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com index 3b55226..0177b5c 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -20,7 +20,7 @@ apt-get install -yq --no-install-recommends \ apt-get install -yq --no-install-recommends imagemagick # Install node & yarn -NODE_INSTALL_VERSION=12.22.1 +NODE_INSTALL_VERSION=16.14.0 YARN_INSTALL_VERSION=1.22.10 /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version