From 3eb92e297a9afde6f8c46674b3681208f93af21b Mon Sep 17 00:00:00 2001
From: bootc-dev Bot <bot@bootc.dev>
Date: Tue, 17 Mar 2026 15:23:33 +0000
Subject: [PATCH] Sync common files from infra repository

Synchronized from bootc-dev/infra@56e4f615d38cc4a923f6a7e2a174a0c05a962451.

Signed-off-by: bootc-dev Bot <bot@bootc.dev>
---
 .bootc-dev-infra-commit.txt            |  2 +-
 .devcontainer/debian/devcontainer.json | 30 ++++++++++++++++++++++++++
 .devcontainer/ubuntu/devcontainer.json | 30 ++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 .devcontainer/debian/devcontainer.json
 create mode 100644 .devcontainer/ubuntu/devcontainer.json

diff --git a/.bootc-dev-infra-commit.txt b/.bootc-dev-infra-commit.txt
index 1163ccea..439a61ce 100644
--- a/.bootc-dev-infra-commit.txt
+++ b/.bootc-dev-infra-commit.txt
@@ -1 +1 @@
-a9c43f8d6fcc95ed00563878bf8632ffa159ee3c
+56e4f615d38cc4a923f6a7e2a174a0c05a962451
diff --git a/.devcontainer/debian/devcontainer.json b/.devcontainer/debian/devcontainer.json
new file mode 100644
index 00000000..f1b43a85
--- /dev/null
+++ b/.devcontainer/debian/devcontainer.json
@@ -0,0 +1,30 @@
+{
+  "name": "bootc-devenv-debian",
+  "image": "ghcr.io/bootc-dev/devenv-debian",
+  "customizations": {
+    "vscode": {
+      // Arbitrary, but most of our code is in one of these two
+      "extensions": [
+        "rust-lang.rust-analyzer",
+        "golang.Go"
+      ]
+    },
+    "devaipod": {
+      // When running under devaipod, use minimal capabilities
+      // (SYS_ADMIN, NET_ADMIN, etc.) instead of full --privileged.
+      "nestedContainers": true
+    }
+  },
+  "features": {},
+  // Use privileged mode for broad compatibility (Codespaces, Docker,
+  // stock devcontainer CLI). devaipod overrides this with tighter
+  // security via the nestedContainers customization above.
+  "privileged": true,
+  "postCreateCommand": {
+    // Our init script
+    "devenv-init": "sudo /usr/local/bin/devenv-init.sh"
+  },
+  "remoteEnv": {
+    "PATH": "${containerEnv:PATH}:/usr/local/cargo/bin"
+  }
+}
diff --git a/.devcontainer/ubuntu/devcontainer.json b/.devcontainer/ubuntu/devcontainer.json
new file mode 100644
index 00000000..8a6167ac
--- /dev/null
+++ b/.devcontainer/ubuntu/devcontainer.json
@@ -0,0 +1,30 @@
+{
+  "name": "bootc-devenv-ubuntu",
+  "image": "ghcr.io/bootc-dev/devenv-ubuntu",
+  "customizations": {
+    "vscode": {
+      // Arbitrary, but most of our code is in one of these two
+      "extensions": [
+        "rust-lang.rust-analyzer",
+        "golang.Go"
+      ]
+    },
+    "devaipod": {
+      // When running under devaipod, use minimal capabilities
+      // (SYS_ADMIN, NET_ADMIN, etc.) instead of full --privileged.
+      "nestedContainers": true
+    }
+  },
+  "features": {},
+  // Use privileged mode for broad compatibility (Codespaces, Docker,
+  // stock devcontainer CLI). devaipod overrides this with tighter
+  // security via the nestedContainers customization above.
+  "privileged": true,
+  "postCreateCommand": {
+    // Our init script
+    "devenv-init": "sudo /usr/local/bin/devenv-init.sh"
+  },
+  "remoteEnv": {
+    "PATH": "${containerEnv:PATH}:/usr/local/cargo/bin"
+  }
+}