From ba9fdde9929246da1d5725cc8b0e8f972b88f899 Mon Sep 17 00:00:00 2001
From: Maxime Girardet <maximeinformatique@free.fr>
Date: Mon, 21 Apr 2025 23:33:59 +0000
Subject: [PATCH] merge: Unify devcontainer and docker-compose

See merge request opensavvy/playgrounds/baseline!47
---
 .devcontainer/devcontainer.json | 8 +++++---
 .devcontainer/docker-compose.yml | 10 ++++++++++
 docker/docker-compose.yml | 1 +
 3 file(s) changed, 16 insertion(s)(+), 3 deletion(s)(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,7 @@
 {
-	"build": {
-		"dockerfile": "Dockerfile"
-	}
+	"dockerComposeFile": [
+		"./docker-compose.yml"
+	],
+	"service": "workspace",
+	"shutdownAction": "stopCompose"
 }
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,10 @@
+
+include:
+  - ../docker/docker-compose.yml
+
+services:
+  workspace:
+    build:
+      dockerfile: ./Dockerfile
+      context: .
+    command: /bin/sh -c "while sleep 1000; do :; done"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,1 @@
+name: OpenSavvy Playground

--
tangled.sh