From bfbde18c300bd984a031505b1e9b3a552227f5fc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Jul 2026 17:35:30 +0000
Subject: [PATCH 1/3] Use Ubuntu base for devcontainer

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>
---
 .devcontainer/devcontainer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4d30c4fcf50..a0cff4f130d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "Primer React",
-  "image": "mcr.microsoft.com/vscode/devcontainers/typescript-node:26",
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu24.04",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -14,7 +14,7 @@
   },
   "forwardPorts": [8000],
   "onCreateCommand": ["/bin/bash", "-c", "npm run setup"],
-  "remoteUser": "node",
+  "remoteUser": "vscode",
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
       "version": "26.4.0"

From 07c4d429cb16a14e601836bd0e28aaeb4dd48546 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Jul 2026 18:09:25 +0000
Subject: [PATCH 2/3] Install devcontainer Node from nvmrc

Co-authored-by: joshblack <3901764+joshblack@users.noreply.github.com>
---
 .devcontainer/devcontainer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a0cff4f130d..fbf3dda375a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,11 +13,11 @@
     }
   },
   "forwardPorts": [8000],
-  "onCreateCommand": ["/bin/bash", "-c", "npm run setup"],
+  "onCreateCommand": ["/bin/bash", "-c", ". \"${NVM_DIR}/nvm.sh\" && nvm install && npm run setup"],
   "remoteUser": "vscode",
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "26.4.0"
+      "version": "none"
     },
     "ghcr.io/devcontainers/features/sshd:1": {
       "version": "latest"

From 21841e7c5e5fde7984d675ab6853f0ed25278f04 Mon Sep 17 00:00:00 2001
From: Josh Black <joshblack@github.com>
Date: Fri, 17 Jul 2026 13:14:28 -0500
Subject: [PATCH 3/3] Update devcontainer configuration

Updated Node.js feature version and simplified onCreateCommand.
---
 .devcontainer/devcontainer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fbf3dda375a..7ce8df26c14 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,11 +13,11 @@
     }
   },
   "forwardPorts": [8000],
-  "onCreateCommand": ["/bin/bash", "-c", ". \"${NVM_DIR}/nvm.sh\" && nvm install && npm run setup"],
+  "onCreateCommand": ["/bin/bash", "-c", "npm run setup"],
   "remoteUser": "vscode",
   "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "none"
+    "ghcr.io/devcontainers/features/node:2.1.0": {
+      "version": "26.4.0"
     },
     "ghcr.io/devcontainers/features/sshd:1": {
       "version": "latest"