From 9dcd38f78bc870ed4c74b12322e14b1356e20181 Mon Sep 17 00:00:00 2001
From: Brian Egge <brianegge@gmail.com>
Date: Sat, 7 Dec 2024 21:06:01 +0000
Subject: [PATCH] Split docker/podman devcontainers

---
 .devcontainer/docker/devcontainer.json       | 44 ++++++++++++++++++++
 .devcontainer/{ => podman}/devcontainer.json |  4 +-
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 .devcontainer/docker/devcontainer.json
 rename .devcontainer/{ => podman}/devcontainer.json (95%)

diff --git a/.devcontainer/docker/devcontainer.json b/.devcontainer/docker/devcontainer.json
new file mode 100644
index 00000000..c266998f
--- /dev/null
+++ b/.devcontainer/docker/devcontainer.json
@@ -0,0 +1,44 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+	"name": "Ubuntu",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"build": {
+		"dockerfile": "../Dockerfile",
+		"context": "../..",
+		"args": {
+		  // Options
+		  "NODE_VERSION": "none"
+		}
+	  },
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+	"runArgs": [],
+	"containerUser": "vscode",
+	"updateRemoteUserUID": true,
+	"containerEnv": {
+	  "HOME": "/home/vscode"
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"github.vscode-github-actions",
+				"GitHub.vscode-pull-request-github",
+				"ms-azuretools.vscode-docker",
+				"ms-vscode.cmake-tools"
+			]
+		}
+	}
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/podman/devcontainer.json
similarity index 95%
rename from .devcontainer/devcontainer.json
rename to .devcontainer/podman/devcontainer.json
index 5e6ab2b7..a52dd69c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/podman/devcontainer.json
@@ -4,8 +4,8 @@
 	"name": "Ubuntu",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
 	"build": {
-		"dockerfile": "Dockerfile",
-		"context": "..",
+		"dockerfile": "../Dockerfile",
+		"context": "../..",
 		"args": {
 		  // Options
 		  "NODE_VERSION": "none"