From 39aa555a338f027060046ffd7239200614514aee Mon Sep 17 00:00:00 2001
From: jackyu <jackyu@yunify.com>
Date: Wed, 11 Dec 2024 10:23:41 +0800
Subject: [PATCH] upgrade nodejs version to v16.20.2

---
 nodejs/Dockerfile        | 48 +++++++---------------------------------
 nodejs/podman/Dockerfile | 48 +++++++---------------------------------
 2 files changed, 16 insertions(+), 80 deletions(-)

diff --git a/nodejs/Dockerfile b/nodejs/Dockerfile
index 183fe0f..57b1747 100644
--- a/nodejs/Dockerfile
+++ b/nodejs/Dockerfile
@@ -1,43 +1,11 @@
-FROM kubespheredev/builder-base:v3.1.0
+FROM kubespheredev/builder-base:v4.1.0
 
-ENV NODE_VERSION 10.16.3
+ENV NODE_VERSION v16.20.2
 
-RUN ARCH= && uArch="$(uname -m)" \
-  && case "${uArch##*-}" in \
-    x86_64) ARCH='x64';; \
-    aarch64) ARCH='arm64';; \
-    *) echo "unsupported architecture"; exit 1 ;; \
-  esac \
-  # gpg keys listed at https://github.com/nodejs/node#release-keys
-  && set -ex \
-  && for key in \
-    4ED778F539E3634C779C87C6D7062848A1AB005C \
-    141F07595B7B3FFE74309A937405533BE57C7D57 \
-    74F12602B6F1C4E913FAA37AD3A89613643B6201 \
-    61FC681DFB92A079F1685E77973F295594EC4689 \
-    8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
-    C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
-    108F52B48DB57BB0CC439B2997B01419BD92F80A \
-  ; do \
-    gpg --batch --keyserver sks.srv.dumain.com --recv-keys "$key"; \
-  done \
-  && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
-  && curl -fsSLO https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt \
-  && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
-  && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
-  && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \
-  && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
-  && yum install -y nodejs gcc-c++ make bzip2 GConf2 gtk2 chromedriver chromium xorg-x11-server-Xvfb
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh && \
+    bash nodesource_setup.sh && \
+    apt-get install nodejs -y && \
+    node -v && npm -v
 
-RUN npm -g config set user root
-RUN npm i -g watch-cli vsce typescript
-
-# Yarn
-ENV YARN_VERSION 1.16.0
-RUN curl -f -L -o /tmp/yarn.tgz https://github.com/yarnpkg/yarn/releases/download/v${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz && \
-	tar xf /tmp/yarn.tgz && \
-	mv yarn-v${YARN_VERSION} /opt/yarn && \
-	ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn && \
-	yarn config set cache-folder /root/.yarn
+RUN npm install -g yarn && \
+    yarn config set cache-folder /root/.yarn
diff --git a/nodejs/podman/Dockerfile b/nodejs/podman/Dockerfile
index a91fb7d..24d8d44 100644
--- a/nodejs/podman/Dockerfile
+++ b/nodejs/podman/Dockerfile
@@ -1,43 +1,11 @@
-FROM kubespheredev/builder-base:v3.1.0-podman
+FROM kubespheredev/builder-base:v4.1.0-podman
 
-ENV NODE_VERSION 10.16.3
+ENV NODE_VERSION v16.20.2
 
-RUN ARCH= && uArch="$(uname -m)" \
-  && case "${uArch##*-}" in \
-    x86_64) ARCH='x64';; \
-    aarch64) ARCH='arm64';; \
-    *) echo "unsupported architecture"; exit 1 ;; \
-  esac \
-  # gpg keys listed at https://github.com/nodejs/node#release-keys
-  && set -ex \
-  && for key in \
-    4ED778F539E3634C779C87C6D7062848A1AB005C \
-    141F07595B7B3FFE74309A937405533BE57C7D57 \
-    74F12602B6F1C4E913FAA37AD3A89613643B6201 \
-    61FC681DFB92A079F1685E77973F295594EC4689 \
-    8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-    C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-    890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
-    C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
-    108F52B48DB57BB0CC439B2997B01419BD92F80A \
-  ; do \
-    gpg --batch --keyserver sks.srv.dumain.com --recv-keys "$key"; \
-  done \
-  && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
-  && curl -fsSLO https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt \
-  && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
-  && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
-  && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt \
-  && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
-  && yum install -y nodejs gcc-c++ make bzip2 GConf2 gtk2 chromedriver chromium xorg-x11-server-Xvfb
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh && \
+    bash nodesource_setup.sh && \
+    apt-get install nodejs -y && \
+    node -v && npm -v
 
-RUN npm -g config set user root
-RUN npm i -g watch-cli vsce typescript
-
-# Yarn
-ENV YARN_VERSION 1.16.0
-RUN curl -f -L -o /tmp/yarn.tgz https://github.com/yarnpkg/yarn/releases/download/v${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz && \
-	tar xf /tmp/yarn.tgz && \
-	mv yarn-v${YARN_VERSION} /opt/yarn && \
-	ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn && \
-	yarn config set cache-folder /root/.yarn
+RUN npm install -g yarn && \
+    yarn config set cache-folder /root/.yarn