From f4cd47d024e2c628e827e5475c668d0cd9ce482c Mon Sep 17 00:00:00 2001 From: Roman Dodin Date: Sat, 7 Dec 2024 15:30:41 +0100 Subject: [PATCH] devcontainer build with qemu setup (#2336) --- .devcontainer/docker-in-docker/devcontainer.json | 2 +- .devcontainer/docker-in-docker_slim/devcontainer.json | 2 +- .devcontainer/docker-outside-of-docker/devcontainer.json | 2 +- .../docker-outside-of-docker_slim/devcontainer.json | 2 +- .github/workflows/build-devcontainer.yml | 5 ++++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.devcontainer/docker-in-docker/devcontainer.json b/.devcontainer/docker-in-docker/devcontainer.json index 61a0d9f3d..214cf5bc7 100644 --- a/.devcontainer/docker-in-docker/devcontainer.json +++ b/.devcontainer/docker-in-docker/devcontainer.json @@ -12,7 +12,7 @@ // docker/moby version is that old because newer ones failed to install under emulation // see https://github.com/moby/moby/issues/48987#issuecomment-2507267417 // and https://github.com/moby/moby/issues/47895#issuecomment-2507528678 - "version": "23.0.7", + "version": "26.1.5", "dockerDashComposeVersion": "none", "installDockerComposeSwitch": "false" }, diff --git a/.devcontainer/docker-in-docker_slim/devcontainer.json b/.devcontainer/docker-in-docker_slim/devcontainer.json index 33039b426..dfb1375c4 100644 --- a/.devcontainer/docker-in-docker_slim/devcontainer.json +++ b/.devcontainer/docker-in-docker_slim/devcontainer.json @@ -9,7 +9,7 @@ }, "features": { "ghcr.io/devcontainers/features/docker-in-docker:2": { - "version": "23.0.7", + "version": "26.1.5", "dockerDashComposeVersion": "none", "installDockerComposeSwitch": "false" }, diff --git a/.devcontainer/docker-outside-of-docker/devcontainer.json b/.devcontainer/docker-outside-of-docker/devcontainer.json index c5e36e5d5..7a08d7e93 100644 --- a/.devcontainer/docker-outside-of-docker/devcontainer.json +++ b/.devcontainer/docker-outside-of-docker/devcontainer.json @@ -19,7 +19,7 @@ ], "features": { "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - "version": "23.0.7", + "version": "26.1.5", "dockerDashComposeVersion": "none", "installDockerComposeSwitch": "false" }, diff --git a/.devcontainer/docker-outside-of-docker_slim/devcontainer.json b/.devcontainer/docker-outside-of-docker_slim/devcontainer.json index 5e9b4fba2..c565f0314 100644 --- a/.devcontainer/docker-outside-of-docker_slim/devcontainer.json +++ b/.devcontainer/docker-outside-of-docker_slim/devcontainer.json @@ -19,7 +19,7 @@ ], "features": { "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - "version": "23.0.7", + "version": "26.1.5", "dockerDashComposeVersion": "none", "installDockerComposeSwitch": "false" }, diff --git a/.github/workflows/build-devcontainer.yml b/.github/workflows/build-devcontainer.yml index c22bf4756..70cf2d16c 100644 --- a/.github/workflows/build-devcontainer.yml +++ b/.github/workflows/build-devcontainer.yml @@ -19,7 +19,7 @@ on: required: false type: string # trigger on published release event - # to created the devspace container when the packages are published + # to created the dev container when the packages are published release: types: - published @@ -54,6 +54,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Setup QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3