From 4b2abdf48dcb56451863de2a8c8eef357ef38730 Mon Sep 17 00:00:00 2001 From: Amin Ya Date: Mon, 5 May 2025 00:34:02 -0700 Subject: [PATCH] fix: fix dev container failing to build (#21218) The dev container fails to build because of the outdated docker-in-docker feature. This updates the docker-in-docker and fixes the build. I also updated the docker compose references in the docs. --- .devcontainer/devcontainer.json | 5 ++--- .../src/main/resources/python-fastapi/README.mustache | 2 +- samples/server/petstore/python-fastapi/README.md | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 92423daeffb..4c932ec591a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -11,10 +11,9 @@ }, "ghcr.io/devcontainers/features/rust:1": {}, "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {}, - "docker-in-docker": { + "ghcr.io/devcontainers/features/docker-in-docker:2": { "version": "latest", - "moby": true, - "dockerDashComposeVersion": "v1" + "moby": true } }, // Configure tool-specific properties. diff --git a/modules/openapi-generator/src/main/resources/python-fastapi/README.mustache b/modules/openapi-generator/src/main/resources/python-fastapi/README.mustache index 5380fa1e169..a86e164d20d 100644 --- a/modules/openapi-generator/src/main/resources/python-fastapi/README.mustache +++ b/modules/openapi-generator/src/main/resources/python-fastapi/README.mustache @@ -29,7 +29,7 @@ and open your browser at `http://localhost:{{serverPort}}/docs/` to see the docs To run the server on a Docker container, please execute the following from the root directory: ```bash -docker-compose up --build +docker compose up --build ``` ## Tests diff --git a/samples/server/petstore/python-fastapi/README.md b/samples/server/petstore/python-fastapi/README.md index e184dbf99fb..84f20179422 100644 --- a/samples/server/petstore/python-fastapi/README.md +++ b/samples/server/petstore/python-fastapi/README.md @@ -26,7 +26,7 @@ and open your browser at `http://localhost:8080/docs/` to see the docs. To run the server on a Docker container, please execute the following from the root directory: ```bash -docker-compose up --build +docker compose up --build ``` ## Tests