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 '62-upgrade-noe-js-from-12-4-0-non-lts-to-14-x-lts-14-16-0-by-default' into 'master'

Browse source 
Upgrade the default Node.js version from 12.4.0 to 14.16.0 as a system

Closes #62

See merge request gitlab-org/gitlab-build-images!374
This commit is contained in:
Rémy Coutable 2021-03-01 10:19:36 +00:00
commit 615e078e0e
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/custom-docker-build
View file

@ -151,8 +151,9 @@ 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|12.18) NODE_INSTALL_VERSION=12.18.4 ;;
14|14.15) NODE_INSTALL_VERSION=14.15.4 ;;
12.18) NODE_INSTALL_VERSION=12.18.4 ;;
14.15) NODE_INSTALL_VERSION=14.15.4 ;;
14|14.16) NODE_INSTALL_VERSION=14.16.0 ;;
*) echo "Unknown node version $1"; exit 1;
esac
printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"

2
scripts/install-node
View file

@ -2,7 +2,7 @@
set -xeuo pipefail
IFS=$'\n\t'
NODE_INSTALL_VERSION=${1:-12.4.0}
NODE_INSTALL_VERSION=${1:-14.16.0}
YARN_INSTALL_VERSION=${2:-1.21.1-1}
# Map MAJOR.MINOR.patch -> MAJOR.x