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 'vs/bump-nodejs-16' into 'master'

Browse source 
Bump Node.js to 16.14.2

See merge request gitlab-org/gitlab-build-images!505
This commit is contained in:
Balasankar 'Balu' C 2022-03-21 09:24:57 +00:00
commit e0f3cc2a4d
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.danger
View file

@ -6,7 +6,7 @@ MAINTAINER GitLab Quality Team
# eg. https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/275286625 # eg. https://gitlab.com/gitlab-org/gitlab-foss/-/jobs/275286625
ENV LC_ALL "C.UTF-8" ENV LC_ALL "C.UTF-8"
ENV NODE_VERSION=16.14.0 ENV NODE_VERSION=16.14.2
ENV YARN_VERSION=1.22.17 ENV YARN_VERSION=1.22.17
ENV GITLAB_GEM_VERSION=4.18.0 ENV GITLAB_GEM_VERSION=4.18.0
ENV DANGER_GEM_VERSION=8.4.5 ENV DANGER_GEM_VERSION=8.4.5

2
scripts/custom-docker-build
View file

@ -104,7 +104,7 @@ function print_node_args() {
12.22) NODE_INSTALL_VERSION=12.22.1 ;; 12.22) NODE_INSTALL_VERSION=12.22.1 ;;
14.15) NODE_INSTALL_VERSION=14.15.4 ;; 14.15) NODE_INSTALL_VERSION=14.15.4 ;;
14|14.16) NODE_INSTALL_VERSION=14.16.0 ;; 14|14.16) NODE_INSTALL_VERSION=14.16.0 ;;
16|16.14) NODE_INSTALL_VERSION=16.14.0 ;; 16|16.14) NODE_INSTALL_VERSION=16.14.2 ;;
*) echo "Unknown node version $1"; exit 1; *) echo "Unknown node version $1"; exit 1;
esac esac
printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION" printf -- "--build-arg NODE_INSTALL_VERSION=%s " "$NODE_INSTALL_VERSION"

2
scripts/install-node
View file

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

2
scripts/install-www-gitlab-com
View file

@ -20,7 +20,7 @@ apt-get install -yq --no-install-recommends \
apt-get install -yq --no-install-recommends imagemagick apt-get install -yq --no-install-recommends imagemagick
# Install node & yarn # Install node & yarn
NODE_INSTALL_VERSION=16.14.0 NODE_INSTALL_VERSION=16.14.2
YARN_INSTALL_VERSION=1.22.10 YARN_INSTALL_VERSION=1.22.10
/scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version