From f5ed86d5a8cef346ec4bd82d92cd418a7e915cb2 Mon Sep 17 00:00:00 2001
From: RedYetiDev <38299977+RedYetiDev@users.noreply.github.com>
Date: Mon, 12 Aug 2024 18:34:22 -0400
Subject: [PATCH 1/2] meta: update devcontainer to the latest schema

---
 .devcontainer.json              | 22 ++++++++++++++++++++++
 .devcontainer/devcontainer.json | 18 ------------------
 .gitignore                      |  3 +--
 3 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 .devcontainer.json
 delete mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer.json b/.devcontainer.json
new file mode 100644
index 00000000000000..cccdb0c0ef2701
--- /dev/null
+++ b/.devcontainer.json
@@ -0,0 +1,22 @@
+{
+  "name": "Node.js Core Developer Environment",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "github.vscode-pull-request-github",
+        "ms-vsliveshare.vsliveshare",
+        "vscode-icons-team.vscode-icons",
+        "visualstudioexptteam.vscodeintellicode"
+      ],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "zsh (login)": {
+            "path": "zsh",
+            "args": ["-l"]
+          }
+        }
+      }
+    }
+  },
+  "image": "nodejs/devcontainer:nightly"
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
deleted file mode 100644
index 75fda6e5b319b9..00000000000000
--- a/.devcontainer/devcontainer.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "Node.js Core Developer Environment",
-  "extensions": [
-    "github.vscode-pull-request-github",
-    "ms-vsliveshare.vsliveshare",
-    "vscode-icons-team.vscode-icons",
-    "visualstudioexptteam.vscodeintellicode"
-  ],
-  "image": "nodejs/devcontainer:nightly",
-  "settings": {
-    "terminal.integrated.profiles.linux": {
-      "zsh (login)": {
-        "path": "zsh",
-        "args": ["-l"]
-      }
-    }
-  }
-}
diff --git a/.gitignore b/.gitignore
index fad2496b978066..3558c96f585fc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,7 @@
 .*
 # Exclude specific dotfiles that we want to track.
 !deps/**/.*
-!.devcontainer/
-!.devcontainer/.devcontainer.json
+!.devcontainer.json
 !test/fixtures/**/.*
 !.clang-format
 !.cpplint

From aa7548c12240e11c12a12d38bae27a319d8b45c3 Mon Sep 17 00:00:00 2001
From: Aviv Keller <redyetidev@gmail.com>
Date: Wed, 4 Sep 2024 07:40:47 -0400
Subject: [PATCH 2/2] Fix for ARM64

Co-Authored-By: bharath063 <5726047+bharath063@users.noreply.github.com>
---
 .devcontainer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.devcontainer.json b/.devcontainer.json
index cccdb0c0ef2701..c0ae5292d6b572 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -1,5 +1,8 @@
 {
   "name": "Node.js Core Developer Environment",
+  "runArgs": [
+    "--platform=linux/amd64"
+  ],
   "customizations": {
     "vscode": {
       "extensions": [