From 8be66b3973b52499bdcbe28e5442a11ad992a554 Mon Sep 17 00:00:00 2001 From: Roman Dodin Date: Sat, 7 Dec 2024 13:58:02 +0100 Subject: [PATCH] test with qemu setup --- .../docker-outside-of-docker_slim/devcontainer.json | 2 +- .github/workflows/build-devcontainer.yml | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) 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..038c0b2c9 100644 --- a/.github/workflows/build-devcontainer.yml +++ b/.github/workflows/build-devcontainer.yml @@ -33,9 +33,9 @@ jobs: strategy: matrix: variant: - - "dind" - - "dind-slim" - - "dood" + # - "dind" + # - "dind-slim" + # - "dood" - "dood-slim" include: - variant: dind @@ -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 @@ -108,5 +111,6 @@ jobs: imageName: ghcr.io/${{ github.repository }}/devcontainer${{ matrix.image-suffix }} imageTag: ${{ steps.extract-tags.outputs.tags }} push: always - platform: linux/amd64,linux/arm64 + # platform: linux/amd64,linux/arm64 + platform: linux/arm64 configFile: ${{ matrix.devContFile }}