From b256652c0bd782405f3133451b5efd7ed7fff9a8 Mon Sep 17 00:00:00 2001
From: Marcel Bargull <marcel.bargull@udo.edu>
Date: Sun, 2 Jun 2024 11:54:49 +0200
Subject: [PATCH] Try newer podman/buildah via travier/podman-action

Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
---
 .../workflows/base-glibc-busybox-bash.yaml    | 30 +++++++++++++++----
 .github/workflows/base-glibc-debian-bash.yaml | 30 +++++++++++++++----
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/base-glibc-busybox-bash.yaml b/.github/workflows/base-glibc-busybox-bash.yaml
index d16ca52..9d23f05 100644
--- a/.github/workflows/base-glibc-busybox-bash.yaml
+++ b/.github/workflows/base-glibc-busybox-bash.yaml
@@ -15,6 +15,10 @@ jobs:
   build:
     name: Build & Push
     runs-on: ubuntu-24.04
+    container:
+      # travier/podman-action contains newer podman/buildah versions.
+      image: quay.io/travier/podman-action
+      options: --privileged
     env:
       # The base image is not intended to change often and should be used with
       # version tags or checksum IDs, but not via "latest".
@@ -28,15 +32,29 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
+      run: |
+        podman run --rm --privileged \
+          docker.io/tonistiigi/binfmt --install arm64
 
-    - name: Info
+    - name: Install Tools
       run: |
         set -xeu
-        podman --version
-        buildah --version
+        # jq is not installed in travier/podman-action
+        dnf install --yes \
+          jq
+        rpm -q \
+          buildah podman \
+          coreutils findutils sed \
+          curl jq \
+          | (
+            while read -r line ; do
+              printf %s\\n "${line}"
+              case "${line}" in (*' not installed'*)
+                err=1 ;;
+              esac
+              done
+              exit "${err-0}"
+          )
 
     - name: Build
       id: build
diff --git a/.github/workflows/base-glibc-debian-bash.yaml b/.github/workflows/base-glibc-debian-bash.yaml
index 9ebbfcf..df08ad1 100644
--- a/.github/workflows/base-glibc-debian-bash.yaml
+++ b/.github/workflows/base-glibc-debian-bash.yaml
@@ -15,6 +15,10 @@ jobs:
   build:
     name: Build & Push
     runs-on: ubuntu-24.04
+    container:
+      # travier/podman-action contains newer podman/buildah versions.
+      image: quay.io/travier/podman-action
+      options: --privileged
     env:
       # The base image is not intended to change often and should be used with
       # version tags or checksum IDs, but not via "latest".
@@ -27,15 +31,29 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-      with:
-        platforms: arm64
+      run: |
+        podman run --rm --privileged \
+          docker.io/tonistiigi/binfmt --install arm64
 
-    - name: Info
+    - name: Install Tools
       run: |
         set -xeu
-        podman --version
-        buildah --version
+        # jq is not installed in travier/podman-action
+        dnf install --yes \
+          jq
+        rpm -q \
+          buildah podman \
+          coreutils findutils sed \
+          curl jq \
+          | (
+            while read -r line ; do
+              printf %s\\n "${line}"
+              case "${line}" in (*' not installed'*)
+                err=1 ;;
+              esac
+              done
+              exit "${err-0}"
+          )
 
     - name: Build
       id: build