From 074038420f794b1043bbf22847b308f747f68550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Cser=C3=A9p?= <mcserep@gmail.com>
Date: Sun, 1 Oct 2023 13:12:53 +0200
Subject: [PATCH] Update NodeJS install method in Docker images.

---
 docker/dev/Dockerfile | 12 ++++++++++--
 docker/web/Dockerfile | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index e44d3af41..8db4369a4 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -11,7 +11,9 @@ RUN set -x && apt-get update -qq \
   cmake make \
   default-jdk \
   ctags \
+  ca-certificates \
   curl \
+  gnupg \
   doxygen \
   gcc-9 gcc-9-plugin-dev g++-9 \
   libboost-filesystem-dev \
@@ -32,8 +34,14 @@ RUN set -x && apt-get update -qq \
   ln -s /usr/bin/gcc-9 /usr/bin/gcc && \
   ln -s /usr/bin/g++-9 /usr/bin/g++
 
-RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs
+# Install NodeJS from NodeSource.
+RUN mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
+    apt-get update -qq && \
+    apt-get install -y nodejs && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/
 
 # Build GTest.
 RUN cd /usr/src/googletest && \
diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
index 732ba46d5..68daac16f 100644
--- a/docker/web/Dockerfile
+++ b/docker/web/Dockerfile
@@ -32,13 +32,21 @@ RUN set -x && apt-get update -qq \
     # To switch user and exec command.
     gosu \
     tini \
+    ca-certificates \
     curl \
+    gnupg \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/ \
   && set +x
 
-RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs
+# Install NodeJS from NodeSource.
+RUN mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
+    apt-get update -qq && \
+    apt-get install -y nodejs && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/
 
 ARG CC_GID=960
 ARG CC_UID=960