From 1b5ee026d2db0c3e39c4c569f5ead6d3ac3aaf11 Mon Sep 17 00:00:00 2001
From: Max Goltzsche <max.goltzsche@gmail.com>
Date: Thu, 21 Oct 2021 23:04:30 +0200
Subject: [PATCH] update to podman 3.4.1, crun 1.2

---
 .github/workflows/verify.yml | 4 +++-
 Dockerfile                   | 4 ++--
 Dockerfile-remote            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index a645db0..74ce32e 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -16,7 +16,9 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Set up qemu
-      run: make register-qemu-binfmt
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: all
 
     - name: Build & test linux/amd64 image
       run: make images test
diff --git a/Dockerfile b/Dockerfile
index d0cae70..0b3935c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@ RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch ${BATS_VERSION}
 # podman (without systemd support)
 FROM podmanbuildbase AS podman
 RUN apk add --update --no-cache tzdata curl
-ARG PODMAN_VERSION=v3.4.0
+ARG PODMAN_VERSION=v3.4.1
 ARG PODMAN_BUILDTAGS='seccomp selinux apparmor exclude_graphdriver_devicemapper containers_image_openpgp'
 ARG PODMAN_CGO=1
 RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch ${PODMAN_VERSION} https://github.com/containers/podman src/github.com/containers/podman
@@ -149,7 +149,7 @@ COPY --from=runc   /usr/local/bin/runc   /usr/local/bin/runc
 # Download crun
 # (switched keyserver from sks to ubuntu since sks is offline now and gpg refuses to import keys from keys.openpgp.org because it does not provide a user ID with the key.)
 FROM gpg AS crun
-ARG CRUN_VERSION=1.1
+ARG CRUN_VERSION=1.2
 RUN set -ex; \
 	wget -O /usr/local/bin/crun https://github.com/containers/crun/releases/download/$CRUN_VERSION/crun-${CRUN_VERSION}-linux-amd64-disable-systemd; \
 	wget -O /tmp/crun.asc https://github.com/containers/crun/releases/download/$CRUN_VERSION/crun-${CRUN_VERSION}-linux-amd64-disable-systemd.asc; \
diff --git a/Dockerfile-remote b/Dockerfile-remote
index dc9f84d..06bfe2b 100644
--- a/Dockerfile-remote
+++ b/Dockerfile-remote
@@ -11,7 +11,7 @@ RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch ${BATS_VERSION}
 # podman remote
 FROM podmanbuildbase AS podman-remote
 RUN apk add --update --no-cache curl
-ARG PODMAN_VERSION=v3.4.0
+ARG PODMAN_VERSION=v3.4.1
 RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch ${PODMAN_VERSION} https://github.com/containers/podman src/github.com/containers/podman
 WORKDIR $GOPATH/src/github.com/containers/podman
 RUN make install.tools