From 121713a6c725d2e6815e852639d9dabf8dfcd29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Fri, 2 May 2025 16:40:11 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Tweak=20devcontainer=20configura?=
 =?UTF-8?q?tion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .devcontainer/devcontainer.json | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6dd4cba2..a8934552 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,8 @@
 {
         "name": "container.training environment to get started with Docker and/or Kubernetes",
-        "image": "jpetazzo/shpod",
+        "image": "ghcr.io/jpetazzo/shpod",
         "features": {
-                "ghcr.io/devcontainers/features/common-utils:2": {}
+                //"ghcr.io/devcontainers/features/common-utils:2": {}
         },
 
         // Use 'forwardPorts' to make a list of ports inside the container available locally.
@@ -11,14 +11,15 @@
         //"postCreateCommand": "... install extra packages...",
         "postStartCommand": "dind.sh",
 
-        // This would let us use "docker-outside-docker".
-        // But minikube, kind, etc. don't work very well that way, alas.
-        // So we're going to use "docker-in-docker" instead.
-        //"mounts": ["source=/var/run/docker.sock,target=/var/run/docker-host.sock,type=bind"],
+        // This lets us use "docker-outside-docker".
+        // Unfortunately, minikube, kind, etc. don't work very well that way;
+        // so for now, we'll likely use "docker-in-docker" instead (with a 
+        // privilege dcontainer). But we're still exposing that socket in case
+        // someone wants to do something interesting with it.
+        "mounts": ["source=/var/run/docker.sock,target=/var/run/docker-host.sock,type=bind"],
 
-        // Docker-in-docker.
+        // This is for docker-in-docker.
         "privileged": true,
-        "mounts": ["source=dind-var-lib-docker,target=/var/lib/docker,type=volume"],
 
         // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
         "remoteUser": "k8s"