From 03338d12979c55ea2986416b9518b3a6e469a299 Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Wed, 17 Nov 2021 17:57:01 +1100
Subject: [PATCH] [Dockerfile] [Security] Update NodeJS to V16 (LTS) on docker.
 (#16856)

* [Security] Update NodeJS on docker.

https://nodejs.org/en/blog/vulnerability/oct-2021-security-releases/

* Update Dockerfile

* Upgrade npm package

* Update Dockerfile
---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ab29e79b85..483f5e79a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:20.04 as build-dep
 # Use bash for the shell
 SHELL ["/bin/bash", "-c"]
 
-# Install Node v14 (LTS)
-ENV NODE_VER="14.17.6"
+# Install Node v16 (LTS)
+ENV NODE_VER="16.13.0"
 RUN ARCH= && \
     dpkgArch="$(dpkg --print-architecture)" && \
   case "${dpkgArch##*-}" in \
@@ -45,7 +45,8 @@ RUN apt-get update && \
 
 ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin"
 
-RUN npm install -g yarn && \
+RUN npm install -g npm@latest && \
+	npm install -g yarn && \
 	gem install bundler && \
 	apt-get update && \
 	apt-get install -y --no-install-recommends git libicu-dev libidn11-dev \