From fbd19b6a3af5dc99ca483bfa1df85157548ea8cf Mon Sep 17 00:00:00 2001
From: Mathieu Benoit <mathieu-benoit@hotmail.fr>
Date: Fri, 13 Dec 2024 03:05:47 +0000
Subject: [PATCH 1/2] Podman's devcontainer

Signed-off-by: Mathieu Benoit <mathieu-benoit@hotmail.fr>
---
 .devcontainer/{ => docker}/devcontainer.json |  2 +-
 .devcontainer/podman/devcontainer.json       | 24 ++++++++++++++++++++
 .devcontainer/podman/installPodman.sh        |  3 +++
 3 files changed, 28 insertions(+), 1 deletion(-)
 rename .devcontainer/{ => docker}/devcontainer.json (93%)
 create mode 100644 .devcontainer/podman/devcontainer.json
 create mode 100644 .devcontainer/podman/installPodman.sh

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/docker/devcontainer.json
similarity index 93%
rename from .devcontainer/devcontainer.json
rename to .devcontainer/docker/devcontainer.json
index 7d8b6e7..39cefad 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/docker/devcontainer.json
@@ -1,5 +1,5 @@
 {
-	"name": "Score Dev Container",
+	"name": "Score Dev Container with Docker",
 	"image": "mcr.microsoft.com/devcontainers/base:noble",
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {
diff --git a/.devcontainer/podman/devcontainer.json b/.devcontainer/podman/devcontainer.json
new file mode 100644
index 0000000..877be17
--- /dev/null
+++ b/.devcontainer/podman/devcontainer.json
@@ -0,0 +1,24 @@
+{
+	"name": "Score Dev Container with Podman",
+	"image": "mcr.microsoft.com/devcontainers/base:noble",
+	"features": {
+	},
+	"remoteEnv": {
+        "PODMAN_USERNS": "keep-id"
+      },
+    "containerUser": "vscode",
+	"postCreateCommand": "bash .devcontainer/podman/installPodman.sh",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"redhat.vscode-yaml"
+			],
+			"settings": {
+				"yaml.schemas": {
+					"https://raw.githubusercontent.com/score-spec/spec/main/score-v1b1.json": "score.yaml"
+				},
+				"docker.dockerPath": "podman"
+			}
+		}
+	}
+}
diff --git a/.devcontainer/podman/installPodman.sh b/.devcontainer/podman/installPodman.sh
new file mode 100644
index 0000000..123d9c0
--- /dev/null
+++ b/.devcontainer/podman/installPodman.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+#systemctl enable --now --user podman.socket
\ No newline at end of file

From a3227992516933cc370bcfbe609f5a06dc711e74 Mon Sep 17 00:00:00 2001
From: Mathieu Benoit <mathieu-benoit@hotmail.fr>
Date: Mon, 3 Mar 2025 15:08:42 +0000
Subject: [PATCH 2/2] podman now installed

Signed-off-by: Mathieu Benoit <mathieu-benoit@hotmail.fr>
---
 .devcontainer/podman/Dockerfile        |  2 ++
 .devcontainer/podman/devcontainer.json | 18 +++++++++++++-----
 .devcontainer/podman/installPodman.sh  |  3 ---
 3 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 .devcontainer/podman/Dockerfile
 delete mode 100644 .devcontainer/podman/installPodman.sh

diff --git a/.devcontainer/podman/Dockerfile b/.devcontainer/podman/Dockerfile
new file mode 100644
index 0000000..e45a3e6
--- /dev/null
+++ b/.devcontainer/podman/Dockerfile
@@ -0,0 +1,2 @@
+FROM mcr.microsoft.com/devcontainers/base:noble
+RUN sudo apt update && sudo apt -y install podman
\ No newline at end of file
diff --git a/.devcontainer/podman/devcontainer.json b/.devcontainer/podman/devcontainer.json
index 877be17..90c2c0b 100644
--- a/.devcontainer/podman/devcontainer.json
+++ b/.devcontainer/podman/devcontainer.json
@@ -1,13 +1,21 @@
 {
 	"name": "Score Dev Container with Podman",
-	"image": "mcr.microsoft.com/devcontainers/base:noble",
+	"build": {
+        "dockerfile": "Dockerfile"
+    },
 	"features": {
 	},
-	"remoteEnv": {
-        "PODMAN_USERNS": "keep-id"
-      },
+	//"remoteEnv": {
+    //    "PODMAN_USERNS": "keep-id"
+    //  },
+    //"workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,Z",
+    //"workspaceFolder": "/workspace",
+    //"runArgs": ["--userns=keep-id"],
     "containerUser": "vscode",
-	"postCreateCommand": "bash .devcontainer/podman/installPodman.sh",
+    "containerEnv": {
+      "HOME": "/home/vscode"
+    },
+	"postCreateCommand": "bash .devcontainer/installMoreTools.sh",
 	"customizations": {
 		"vscode": {
 			"extensions": [
diff --git a/.devcontainer/podman/installPodman.sh b/.devcontainer/podman/installPodman.sh
deleted file mode 100644
index 123d9c0..0000000
--- a/.devcontainer/podman/installPodman.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-#systemctl enable --now --user podman.socket
\ No newline at end of file