From 1d8842c6136af11528c8997ac8b1efc595bfed26 Mon Sep 17 00:00:00 2001
From: Shaun Hamilton <shauhami020@gmail.com>
Date: Mon, 6 Nov 2023 12:10:49 +0200
Subject: [PATCH] chore(.devcontainer): update Dockerfiles (#52212)

---
 .devcontainer/Dockerfile      | 13 +++++++++----
 .devcontainer/docs/Dockerfile |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 652e5dc35e0..5695f1053e2 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,14 +1,18 @@
-ARG VARIANT=20.04
+ARG VARIANT=22.04
 FROM mcr.microsoft.com/devcontainers/base:ubuntu-${VARIANT}
 
-ARG NODE_VERSION=18
+ARG NODE_MAJOR=20
 ARG MONGODB_VERSION=6.0.4
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y sudo && \
-    curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | sudo -E bash - && \
-    sudo apt-get install -y nodejs && \
+    sudo apt-get install -y ca-certificates curl gnupg && \
+    sudo mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list && \
+    sudo apt-get update && \
+    sudo apt-get install nodejs -y && \
     sudo apt-get install -y libcurl4 openssl liblzma5 && \
     mkdir -p /tmp/mongodb && \
     cd /tmp/mongodb && \
@@ -20,6 +24,7 @@ RUN apt-get update && apt-get install -y sudo && \
     sudo mkdir -p /data/db && \
     sudo chown vscode:vscode -R /data/db
 
+
 # Setup ENV
 ENV COOKIE_DOMAIN=github.dev
 ENV HOME_LOCATION=https://$CODESPACE_NAME-8000.$GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN
diff --git a/.devcontainer/docs/Dockerfile b/.devcontainer/docs/Dockerfile
index 678e4724801..b15d68792f9 100644
--- a/.devcontainer/docs/Dockerfile
+++ b/.devcontainer/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:20-alpine
 
 # Install git
 RUN apk add --no-cache git