From 458c46e95773d3271b926873937ee7f2652977c5 Mon Sep 17 00:00:00 2001
From: Lutz Reinhardt <lutz.reinhardt@elektrobit.com>
Date: Thu, 27 Aug 2026 15:16:04 +0000
Subject: [PATCH] chore: Bump devcontainer to 1.11.0, use KVM and
 docker-in-docker feature

With that `bazel test --lockfile_mode=error --config=linux-x86_64 //feature_integration_tests/itf` works.

`bazel --output_base=build/linux-x86_64 run --config linux-x86_64 //images/linux_x86_64:run` for which the bind mount of the Docker socket was added, works as well.
---
 .devcontainer/devcontainer-lock.json |  9 +++++++++
 .devcontainer/devcontainer.json      | 15 +++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 .devcontainer/devcontainer-lock.json

diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json
new file mode 100644
index 00000000000..3ebce55646d
--- /dev/null
+++ b/.devcontainer/devcontainer-lock.json
@@ -0,0 +1,9 @@
+{
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker": {
+      "version": "4.1.0",
+      "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:7d979c4a36d595eb4ab79909caa3f396daf3b6152dcf38e8328ea4eff42206c7",
+      "integrity": "sha256:7d979c4a36d595eb4ab79909caa3f396daf3b6152dcf38e8328ea4eff42206c7"
+    }
+  }
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d94281d2c45..3f062048030 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,9 +1,16 @@
 {
   "name": "eclipse-s-core",
-  "image": "ghcr.io/eclipse-score/devcontainer:v1.7.0",
-  "mounts": [
-    "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
+  "image": "ghcr.io/eclipse-score/devcontainer:v1.11.0",
+  "runArgs": [
+    "--device=/dev/kvm"
   ],
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker": {
+    }
+  },
   "postCreateCommand": "bash .devcontainer/prepare_workspace.sh",
-  "postStartCommand": "ssh-keygen -f '/home/vscode/.ssh/known_hosts' -R '[localhost]:2222' || true"
+  "postStartCommand": {
+    "Add key to known_hosts": "ssh-keygen -f '/home/vscode/.ssh/known_hosts' -R '[localhost]:2222' || true",
+    "Make /dev/kvm readable and writable": "sudo chmod 666 /dev/kvm"
+  }
 }