CI: try to use base_image

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
drakkan · Feb 6, 2025 · fe9e7f4 · fe9e7f4
1 parent 74ffad8
commit fe9e7f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -472,17 +472,17 @@ jobs:
             go: latest
             go-arch: amd64
           - arch: aarch64
-            distro: ubuntu18.04
+            distro: ubuntu:18.04
             go: latest
             go-arch: arm64
           - arch: ppc64le
-            distro: ubuntu18.04
+            distro: ubuntu:18.04
             go: latest
             go-arch: ppc64le
           - arch: armv7
-            distro: ubuntu18.04
+            distro: ubuntu:18.04
             go: latest
-            go-arch: arm7
+            go-arch: arm7/v7
     steps:
       - uses: actions/checkout@v4
         with:
@@ -534,8 +534,9 @@ jobs:
         name: Build for ${{ matrix.arch }}
         id: build
         with:
-          arch: ${{ matrix.arch }}
-          distro: ${{ matrix.distro }}
+          #arch: ${{ matrix.arch }}
+          #distro: ${{ matrix.distro }}
+          base_image: '--platform=linux/${{ matrix.go-arch }} ubuntu:18.04'
           setup: |
             mkdir -p "${PWD}/output"
           dockerRunArgs: |

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -163,7 +163,7 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           builder: ${{ steps.builder.outputs.name }}