From beedc683da1330d0ab0fcc28eea1db11018f9abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Thu, 17 Apr 2025 19:11:12 +0200 Subject: [PATCH] build(devcontainer): Including the project docker-compose when running with DevContainer --- .devcontainer/devcontainer.json | 8 +++++--- .devcontainer/docker-compose.yml | 10 ++++++++++ docker/docker-compose.yml | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 .devcontainer/docker-compose.yml create mode 100644 docker/docker-compose.yml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b92111d..2f2ba76 100644 --- 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 index 0000000..84be0fb --- /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 index 0000000..61f36d2 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1 @@ +name: OpenSavvy Playground -- 2.51.2