use platform for linux/arm64 image

mpromonet · Oct 27, 2024 · bd7a5c3 · bd7a5c3
1 parent 52c0484
commit bd7a5c3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: build
       run: | 

diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: pkg
       run: | 

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -7,25 +7,25 @@ jobs:
     strategy:
       matrix:
         include:
-        - os: ubuntu-latest
-          image: arm64v8/ubuntu:24.04
+        - image: ubuntu:24.04
           label: arm64
-        - os: ubuntu-latest
-          image: balenalib/raspberry-pi
+          platform: linux/arm64
+        - image: balenalib/raspberry-pi
           label: armv6l
-        - os: ubuntu-latest
-          image: balenalib/raspberry-pi2
+          platform: linux/arm/v6
+        - image: balenalib/raspberry-pi2
           label: armv7
-        - os: ubuntu-latest
-          image: ubuntu:24.04
+          platform: linux/arm/v7
+        - image: ubuntu:24.04
           label: amd64
+          platform: linux/amd64
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Build an image from Dockerfile
       run: |
         docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-        docker build -t docker.io/${{ github.repository }}:${{ matrix.label }} --build-arg IMAGE=${{ matrix.image }} .
+        docker build -t docker.io/${{ github.repository }}:${{ matrix.label }} --platform ${{ matrix.platform }} --build-arg IMAGE=${{ matrix.image }} .
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Build an image from Dockerfile
         run: |