From 83c40096d81defd349661879d8cc9e0313ce27db Mon Sep 17 00:00:00 2001
From: f0reachARR <f0reach@f0reach.me>
Date: Thu, 22 Feb 2024 15:37:40 +0900
Subject: [PATCH] Install qemu to build container

---
 .github/workflows/Docker.yaml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml
index 9c42e07b21d..42f2956f55b 100644
--- a/.github/workflows/Docker.yaml
+++ b/.github/workflows/Docker.yaml
@@ -20,28 +20,18 @@ on:
 jobs:
   build_docker_image:
     name: Build Docker Image
-    runs-on: ${{ matrix.runs_on }}
+    runs-on: ubuntu-22.04
     timeout-minutes: 720
     strategy:
       matrix:
         rosdistro: [humble]
-        runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20
     steps:
-      - name: Install docker for mac runner
-        if: ${{ matrix.runs_on == 'macos-14'}}
-        run: |
-          brew install wget
-          wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz
-          tar -xvzf docker-25.0.3.tgz
-          cp docker/docker /usr/local/bin/
-          mkdir -p $HOME/.docker/cli-plugins
-          wget https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64 -O $HOME/.docker/cli-plugins/docker-buildx
-          chmod a+x $HOME/.docker/cli-plugins/docker-buildx
-
       - name: Install docker for ubuntu runner
-        if: ${{ matrix.runs_on == 'ubuntu-22.04' }}
         uses: docker/setup-buildx-action@v3
 
+      - name: Install QEMU
+        uses: docker/setup-qemu-action@v3
+
       - uses: actions/checkout@v3
 
       - name: Login to GitHub Container Registry
@@ -53,7 +43,6 @@ jobs:
 
       - name: Build and push (amd64)
         uses: docker/bake-action@v3
-        if: ${{ matrix.runs_on == 'ubuntu-22.04' }}
         with:
           files: |
             ./docker-bake.hcl