From 50fc9235de6bd22bc68e9bd80081447242790b58 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Tue, 1 Aug 2023 07:24:10 +0200
Subject: [PATCH] misc: update podman test-qemu

---
 .../test-qemu-2.12-alpine/10-create-image.sh  | 16 ++++++++
 .../11-list-packages.sh                       |  0
 .../20-image-run-shell.sh                     |  0
 .../Dockerfile                                |  0
 .../10-create-image.sh                        |  2 +-
 .../11-list-packages.sh                       |  0
 .../20-image-run-shell.sh                     |  0
 .../Dockerfile                                |  0
 .../10-create-image.sh                        |  2 +-
 .../11-list-packages.sh                       |  0
 .../20-image-run-shell.sh                     |  0
 .../Dockerfile                                |  0
 .../10-create-image.sh                        |  2 +-
 .../11-list-packages.sh                       |  0
 .../20-image-run-shell.sh                     |  0
 .../Dockerfile                                |  0
 .../10-create-image.sh                        |  2 +-
 .../11-list-packages.sh                       |  0
 .../20-image-run-shell.sh                     |  0
 .../test-qemu/test-qemu-6.0-alpine/Dockerfile | 35 ++++++++++++++++
 .../test-qemu-6.1-alpine/10-create-image.sh   | 16 ++++++++
 .../11-list-packages.sh                       |  0
 .../20-image-run-shell.sh                     |  0
 .../Dockerfile                                |  0
 .../test-qemu-7.0-alpine/10-create-image.sh   | 16 ++++++++
 .../11-list-packages.sh                       |  0
 .../20-image-run-shell.sh                     |  0
 .../test-qemu/test-qemu-7.0-alpine/Dockerfile | 35 ++++++++++++++++
 .../test-qemu-7.1-alpine/10-create-image.sh   | 16 ++++++++
 .../test-qemu-7.1-alpine/11-list-packages.sh  | 19 +++++++++
 .../20-image-run-shell.sh                     | 41 +++++++++++++++++++
 .../Dockerfile                                |  0
 .../test-qemu-8.0-alpine/10-create-image.sh   | 16 ++++++++
 .../test-qemu-8.0-alpine/11-list-packages.sh  | 19 +++++++++
 .../20-image-run-shell.sh                     | 41 +++++++++++++++++++
 .../Dockerfile                                |  0
 .../test-qemu6-alpine/10-create-image.sh      | 16 --------
 .../test-qemu7-alpine/10-create-image.sh      | 16 --------
 .../test-qemu8-alpine/10-create-image.sh      | 16 --------
 39 files changed, 274 insertions(+), 52 deletions(-)
 create mode 100755 misc/podman/test-qemu/test-qemu-2.12-alpine/10-create-image.sh
 rename misc/podman/test-qemu/{test-qemu2-alpine => test-qemu-2.12-alpine}/11-list-packages.sh (100%)
 rename misc/podman/test-qemu/{test-qemu2-alpine => test-qemu-2.12-alpine}/20-image-run-shell.sh (100%)
 rename misc/podman/test-qemu/{test-qemu2-alpine => test-qemu-2.12-alpine}/Dockerfile (100%)
 rename misc/podman/test-qemu/{test-qemu2-alpine => test-qemu-3.1-alpine}/10-create-image.sh (90%)
 rename misc/podman/test-qemu/{test-qemu3-alpine => test-qemu-3.1-alpine}/11-list-packages.sh (100%)
 rename misc/podman/test-qemu/{test-qemu3-alpine => test-qemu-3.1-alpine}/20-image-run-shell.sh (100%)
 rename misc/podman/test-qemu/{test-qemu3-alpine => test-qemu-3.1-alpine}/Dockerfile (100%)
 rename misc/podman/test-qemu/{test-qemu4-alpine => test-qemu-4.2-alpine}/10-create-image.sh (90%)
 rename misc/podman/test-qemu/{test-qemu4-alpine => test-qemu-4.2-alpine}/11-list-packages.sh (100%)
 rename misc/podman/test-qemu/{test-qemu4-alpine => test-qemu-4.2-alpine}/20-image-run-shell.sh (100%)
 rename misc/podman/test-qemu/{test-qemu4-alpine => test-qemu-4.2-alpine}/Dockerfile (100%)
 rename misc/podman/test-qemu/{test-qemu3-alpine => test-qemu-5.2-alpine}/10-create-image.sh (90%)
 rename misc/podman/test-qemu/{test-qemu5-alpine => test-qemu-5.2-alpine}/11-list-packages.sh (100%)
 rename misc/podman/test-qemu/{test-qemu5-alpine => test-qemu-5.2-alpine}/20-image-run-shell.sh (100%)
 rename misc/podman/test-qemu/{test-qemu5-alpine => test-qemu-5.2-alpine}/Dockerfile (100%)
 rename misc/podman/test-qemu/{test-qemu5-alpine => test-qemu-6.0-alpine}/10-create-image.sh (90%)
 rename misc/podman/test-qemu/{test-qemu6-alpine => test-qemu-6.0-alpine}/11-list-packages.sh (100%)
 rename misc/podman/test-qemu/{test-qemu6-alpine => test-qemu-6.0-alpine}/20-image-run-shell.sh (100%)
 create mode 100644 misc/podman/test-qemu/test-qemu-6.0-alpine/Dockerfile
 create mode 100755 misc/podman/test-qemu/test-qemu-6.1-alpine/10-create-image.sh
 rename misc/podman/test-qemu/{test-qemu7-alpine => test-qemu-6.1-alpine}/11-list-packages.sh (100%)
 rename misc/podman/test-qemu/{test-qemu7-alpine => test-qemu-6.1-alpine}/20-image-run-shell.sh (100%)
 rename misc/podman/test-qemu/{test-qemu6-alpine => test-qemu-6.1-alpine}/Dockerfile (100%)
 create mode 100755 misc/podman/test-qemu/test-qemu-7.0-alpine/10-create-image.sh
 rename misc/podman/test-qemu/{test-qemu8-alpine => test-qemu-7.0-alpine}/11-list-packages.sh (100%)
 rename misc/podman/test-qemu/{test-qemu8-alpine => test-qemu-7.0-alpine}/20-image-run-shell.sh (100%)
 create mode 100644 misc/podman/test-qemu/test-qemu-7.0-alpine/Dockerfile
 create mode 100755 misc/podman/test-qemu/test-qemu-7.1-alpine/10-create-image.sh
 create mode 100755 misc/podman/test-qemu/test-qemu-7.1-alpine/11-list-packages.sh
 create mode 100755 misc/podman/test-qemu/test-qemu-7.1-alpine/20-image-run-shell.sh
 rename misc/podman/test-qemu/{test-qemu7-alpine => test-qemu-7.1-alpine}/Dockerfile (100%)
 create mode 100755 misc/podman/test-qemu/test-qemu-8.0-alpine/10-create-image.sh
 create mode 100755 misc/podman/test-qemu/test-qemu-8.0-alpine/11-list-packages.sh
 create mode 100755 misc/podman/test-qemu/test-qemu-8.0-alpine/20-image-run-shell.sh
 rename misc/podman/test-qemu/{test-qemu8-alpine => test-qemu-8.0-alpine}/Dockerfile (100%)
 delete mode 100755 misc/podman/test-qemu/test-qemu6-alpine/10-create-image.sh
 delete mode 100755 misc/podman/test-qemu/test-qemu7-alpine/10-create-image.sh
 delete mode 100755 misc/podman/test-qemu/test-qemu8-alpine/10-create-image.sh

diff --git a/misc/podman/test-qemu/test-qemu-2.12-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-2.12-alpine/10-create-image.sh
new file mode 100755
index 00000000..a2d1698f
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-2.12-alpine/10-create-image.sh
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# create the image from Dockerfile
+# using a rootless Podman container
+
+image=upx-test-qemu-2.12-alpine-20230725-v1
+[[ $1 == --print-image ]] && echo "$image" && exit 0
+
+podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
+
+podman image list "$image"
+echo
+podman image tree "$image"
diff --git a/misc/podman/test-qemu/test-qemu2-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-2.12-alpine/11-list-packages.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu2-alpine/11-list-packages.sh
rename to misc/podman/test-qemu/test-qemu-2.12-alpine/11-list-packages.sh
diff --git a/misc/podman/test-qemu/test-qemu2-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-2.12-alpine/20-image-run-shell.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu2-alpine/20-image-run-shell.sh
rename to misc/podman/test-qemu/test-qemu-2.12-alpine/20-image-run-shell.sh
diff --git a/misc/podman/test-qemu/test-qemu2-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-2.12-alpine/Dockerfile
similarity index 100%
rename from misc/podman/test-qemu/test-qemu2-alpine/Dockerfile
rename to misc/podman/test-qemu/test-qemu-2.12-alpine/Dockerfile
diff --git a/misc/podman/test-qemu/test-qemu2-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-3.1-alpine/10-create-image.sh
similarity index 90%
rename from misc/podman/test-qemu/test-qemu2-alpine/10-create-image.sh
rename to misc/podman/test-qemu/test-qemu-3.1-alpine/10-create-image.sh
index 07c4d16a..e535ca27 100755
--- a/misc/podman/test-qemu/test-qemu2-alpine/10-create-image.sh
+++ b/misc/podman/test-qemu/test-qemu-3.1-alpine/10-create-image.sh
@@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
 # create the image from Dockerfile
 # using a rootless Podman container
 
-image=upx-test-qemu2-alpine-20230725-v1
+image=upx-test-qemu-3.1-alpine-20230725-v1
 [[ $1 == --print-image ]] && echo "$image" && exit 0
 
 podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
diff --git a/misc/podman/test-qemu/test-qemu3-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-3.1-alpine/11-list-packages.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu3-alpine/11-list-packages.sh
rename to misc/podman/test-qemu/test-qemu-3.1-alpine/11-list-packages.sh
diff --git a/misc/podman/test-qemu/test-qemu3-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-3.1-alpine/20-image-run-shell.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu3-alpine/20-image-run-shell.sh
rename to misc/podman/test-qemu/test-qemu-3.1-alpine/20-image-run-shell.sh
diff --git a/misc/podman/test-qemu/test-qemu3-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-3.1-alpine/Dockerfile
similarity index 100%
rename from misc/podman/test-qemu/test-qemu3-alpine/Dockerfile
rename to misc/podman/test-qemu/test-qemu-3.1-alpine/Dockerfile
diff --git a/misc/podman/test-qemu/test-qemu4-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-4.2-alpine/10-create-image.sh
similarity index 90%
rename from misc/podman/test-qemu/test-qemu4-alpine/10-create-image.sh
rename to misc/podman/test-qemu/test-qemu-4.2-alpine/10-create-image.sh
index bf2cfb82..186e85c8 100755
--- a/misc/podman/test-qemu/test-qemu4-alpine/10-create-image.sh
+++ b/misc/podman/test-qemu/test-qemu-4.2-alpine/10-create-image.sh
@@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
 # create the image from Dockerfile
 # using a rootless Podman container
 
-image=upx-test-qemu4-alpine-20230725-v1
+image=upx-test-qemu-4.2-alpine-20230725-v1
 [[ $1 == --print-image ]] && echo "$image" && exit 0
 
 podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
diff --git a/misc/podman/test-qemu/test-qemu4-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-4.2-alpine/11-list-packages.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu4-alpine/11-list-packages.sh
rename to misc/podman/test-qemu/test-qemu-4.2-alpine/11-list-packages.sh
diff --git a/misc/podman/test-qemu/test-qemu4-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-4.2-alpine/20-image-run-shell.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu4-alpine/20-image-run-shell.sh
rename to misc/podman/test-qemu/test-qemu-4.2-alpine/20-image-run-shell.sh
diff --git a/misc/podman/test-qemu/test-qemu4-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-4.2-alpine/Dockerfile
similarity index 100%
rename from misc/podman/test-qemu/test-qemu4-alpine/Dockerfile
rename to misc/podman/test-qemu/test-qemu-4.2-alpine/Dockerfile
diff --git a/misc/podman/test-qemu/test-qemu3-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-5.2-alpine/10-create-image.sh
similarity index 90%
rename from misc/podman/test-qemu/test-qemu3-alpine/10-create-image.sh
rename to misc/podman/test-qemu/test-qemu-5.2-alpine/10-create-image.sh
index a5e70d2b..2cd7b7a5 100755
--- a/misc/podman/test-qemu/test-qemu3-alpine/10-create-image.sh
+++ b/misc/podman/test-qemu/test-qemu-5.2-alpine/10-create-image.sh
@@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
 # create the image from Dockerfile
 # using a rootless Podman container
 
-image=upx-test-qemu3-alpine-20230725-v1
+image=upx-test-qemu-5.2-alpine-20230725-v1
 [[ $1 == --print-image ]] && echo "$image" && exit 0
 
 podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
diff --git a/misc/podman/test-qemu/test-qemu5-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-5.2-alpine/11-list-packages.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu5-alpine/11-list-packages.sh
rename to misc/podman/test-qemu/test-qemu-5.2-alpine/11-list-packages.sh
diff --git a/misc/podman/test-qemu/test-qemu5-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-5.2-alpine/20-image-run-shell.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu5-alpine/20-image-run-shell.sh
rename to misc/podman/test-qemu/test-qemu-5.2-alpine/20-image-run-shell.sh
diff --git a/misc/podman/test-qemu/test-qemu5-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-5.2-alpine/Dockerfile
similarity index 100%
rename from misc/podman/test-qemu/test-qemu5-alpine/Dockerfile
rename to misc/podman/test-qemu/test-qemu-5.2-alpine/Dockerfile
diff --git a/misc/podman/test-qemu/test-qemu5-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-6.0-alpine/10-create-image.sh
similarity index 90%
rename from misc/podman/test-qemu/test-qemu5-alpine/10-create-image.sh
rename to misc/podman/test-qemu/test-qemu-6.0-alpine/10-create-image.sh
index 628c0ec6..e5ba78ef 100755
--- a/misc/podman/test-qemu/test-qemu5-alpine/10-create-image.sh
+++ b/misc/podman/test-qemu/test-qemu-6.0-alpine/10-create-image.sh
@@ -6,7 +6,7 @@ argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
 # create the image from Dockerfile
 # using a rootless Podman container
 
-image=upx-test-qemu5-alpine-20230725-v1
+image=upx-test-qemu-6.0-alpine-20230725-v1
 [[ $1 == --print-image ]] && echo "$image" && exit 0
 
 podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
diff --git a/misc/podman/test-qemu/test-qemu6-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-6.0-alpine/11-list-packages.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu6-alpine/11-list-packages.sh
rename to misc/podman/test-qemu/test-qemu-6.0-alpine/11-list-packages.sh
diff --git a/misc/podman/test-qemu/test-qemu6-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-6.0-alpine/20-image-run-shell.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu6-alpine/20-image-run-shell.sh
rename to misc/podman/test-qemu/test-qemu-6.0-alpine/20-image-run-shell.sh
diff --git a/misc/podman/test-qemu/test-qemu-6.0-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-6.0-alpine/Dockerfile
new file mode 100644
index 00000000..6065e605
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-6.0-alpine/Dockerfile
@@ -0,0 +1,35 @@
+FROM docker.io/library/alpine:3.14
+
+# install qemu-6.0.0-r5 and some utils
+RUN apk update && apk upgrade && apk add \
+        bash-completion \
+        coreutils \
+        musl-dbg \
+        qemu-aarch64 \
+        qemu-aarch64_be \
+        qemu-arm \
+        qemu-armeb \
+        qemu-i386 \
+        qemu-m68k \
+        qemu-mips \
+        qemu-mipsel \
+        qemu-ppc \
+        qemu-ppc64 \
+        qemu-ppc64le \
+        qemu-riscv32 \
+        qemu-riscv64 \
+        qemu-s390x \
+        qemu-sh4 \
+        qemu-sh4eb \
+        qemu-x86_64 \
+        strace \
+        zsh \
+    && true
+
+# create default user upx:upx 2000:2000
+RUN adduser upx -u 2000 -D \
+    && cd /home/upx && chmod 00700 . \
+    && mkdir -p .cache/tmp .local/bin src/upx \
+    && chown -R upx:upx . \
+    && true
+USER upx
diff --git a/misc/podman/test-qemu/test-qemu-6.1-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-6.1-alpine/10-create-image.sh
new file mode 100755
index 00000000..69ba25d5
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-6.1-alpine/10-create-image.sh
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# create the image from Dockerfile
+# using a rootless Podman container
+
+image=upx-test-qemu-6.1-alpine-20230725-v1
+[[ $1 == --print-image ]] && echo "$image" && exit 0
+
+podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
+
+podman image list "$image"
+echo
+podman image tree "$image"
diff --git a/misc/podman/test-qemu/test-qemu7-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-6.1-alpine/11-list-packages.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu7-alpine/11-list-packages.sh
rename to misc/podman/test-qemu/test-qemu-6.1-alpine/11-list-packages.sh
diff --git a/misc/podman/test-qemu/test-qemu7-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-6.1-alpine/20-image-run-shell.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu7-alpine/20-image-run-shell.sh
rename to misc/podman/test-qemu/test-qemu-6.1-alpine/20-image-run-shell.sh
diff --git a/misc/podman/test-qemu/test-qemu6-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-6.1-alpine/Dockerfile
similarity index 100%
rename from misc/podman/test-qemu/test-qemu6-alpine/Dockerfile
rename to misc/podman/test-qemu/test-qemu-6.1-alpine/Dockerfile
diff --git a/misc/podman/test-qemu/test-qemu-7.0-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-7.0-alpine/10-create-image.sh
new file mode 100755
index 00000000..1d7261a0
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-7.0-alpine/10-create-image.sh
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# create the image from Dockerfile
+# using a rootless Podman container
+
+image=upx-test-qemu-7.0-alpine-20230725-v1
+[[ $1 == --print-image ]] && echo "$image" && exit 0
+
+podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
+
+podman image list "$image"
+echo
+podman image tree "$image"
diff --git a/misc/podman/test-qemu/test-qemu8-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-7.0-alpine/11-list-packages.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu8-alpine/11-list-packages.sh
rename to misc/podman/test-qemu/test-qemu-7.0-alpine/11-list-packages.sh
diff --git a/misc/podman/test-qemu/test-qemu8-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-7.0-alpine/20-image-run-shell.sh
similarity index 100%
rename from misc/podman/test-qemu/test-qemu8-alpine/20-image-run-shell.sh
rename to misc/podman/test-qemu/test-qemu-7.0-alpine/20-image-run-shell.sh
diff --git a/misc/podman/test-qemu/test-qemu-7.0-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-7.0-alpine/Dockerfile
new file mode 100644
index 00000000..1ad14ed4
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-7.0-alpine/Dockerfile
@@ -0,0 +1,35 @@
+FROM docker.io/library/alpine:3.16
+
+# install qemu-7.0.0-r0 and some utils
+RUN apk update && apk upgrade && apk add \
+        bash-completion \
+        coreutils \
+        musl-dbg \
+        qemu-aarch64 \
+        qemu-aarch64_be \
+        qemu-arm \
+        qemu-armeb \
+        qemu-i386 \
+        qemu-m68k \
+        qemu-mips \
+        qemu-mipsel \
+        qemu-ppc \
+        qemu-ppc64 \
+        qemu-ppc64le \
+        qemu-riscv32 \
+        qemu-riscv64 \
+        qemu-s390x \
+        qemu-sh4 \
+        qemu-sh4eb \
+        qemu-x86_64 \
+        strace \
+        zsh \
+    && true
+
+# create default user upx:upx 2000:2000
+RUN adduser upx -u 2000 -D \
+    && cd /home/upx && chmod 00700 . \
+    && mkdir -p .cache/tmp .local/bin src/upx \
+    && chown -R upx:upx . \
+    && true
+USER upx
diff --git a/misc/podman/test-qemu/test-qemu-7.1-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-7.1-alpine/10-create-image.sh
new file mode 100755
index 00000000..a887f4a8
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-7.1-alpine/10-create-image.sh
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# create the image from Dockerfile
+# using a rootless Podman container
+
+image=upx-test-qemu-7.1-alpine-20230725-v1
+[[ $1 == --print-image ]] && echo "$image" && exit 0
+
+podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
+
+podman image list "$image"
+echo
+podman image tree "$image"
diff --git a/misc/podman/test-qemu/test-qemu-7.1-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-7.1-alpine/11-list-packages.sh
new file mode 100755
index 00000000..58445cc0
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-7.1-alpine/11-list-packages.sh
@@ -0,0 +1,19 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# list all system packages that are installed in the image
+# using a rootless Podman container
+
+image="$("$argv0dir/10-create-image.sh" --print-image)"
+
+podman image list "$image"
+echo
+podman image tree "$image"
+
+echo 'Packages:'
+flags=( --read-only --rm --pull=never )
+flags+=( --cap-drop=all )               # drop all capabilities
+flags+=( --network=none )               # no network needed
+podman run "${flags[@]}" "$image" bash -c $'apk info -v | sed \'s/ *$//\' | LC_ALL=C sort'
diff --git a/misc/podman/test-qemu/test-qemu-7.1-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-7.1-alpine/20-image-run-shell.sh
new file mode 100755
index 00000000..d4f61f5d
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-7.1-alpine/20-image-run-shell.sh
@@ -0,0 +1,41 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# run an interactive shell in the image
+# using a rootless Podman container
+
+image="$("$argv0dir/10-create-image.sh" --print-image)"
+
+flags=( --read-only --rm --pull=never )
+flags+=( --cap-drop=all )               # drop all capabilities
+flags+=( --network=none )               # no network needed
+flags+=( -ti -e TERM="$TERM" )          # allocate an interactive pseudo-tty and pass $TERM
+if [[ 1 == 1 ]]; then
+    # run as user upx 2000:2000
+    flags+=( --user 2000 )
+    # map container users 0..999 to subuid-users 1..1000, and map container user 2000 to current host user
+    flags+=( --uidmap=0:1:1000 --uidmap=2000:0:1 )
+    # map container groups 0..999 to subgid-groups 1..1000, and map container group 2000 to current host group
+    flags+=( --gidmap=0:1:1000 --gidmap=2000:0:1 )
+    # NOTE: we mount the upx top-level directory read-write under /home/upx/src/upx
+    # INFO: SELinux users *may* have to add ":z" to the volume mount flags; check the docs!
+    flags+=( -v "${argv0dir}/../../../..:/home/upx/src/upx" )
+    flags+=( -w /home/upx/src/upx )     # set working directory
+    flags+=( --tmpfs /home/upx/.cache:rw,exec ) # mount a writeable tmpfs
+    flags+=( --tmpfs /home/upx/.local:rw,exec ) # mount a writeable tmpfs
+else
+    # run as user root 0:0
+    # ONLY FOR DEBUGGING THE IMAGE
+    # map container user/group 0 to current host user/group
+    flags+=( --user 0 )
+fi
+
+if [[ $# == 0 ]]; then
+    podman run "${flags[@]}" "$image" bash -l
+else
+    podman run "${flags[@]}" "$image" "$@"
+fi
+
+# please see usage instructions in ../README.md
diff --git a/misc/podman/test-qemu/test-qemu7-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-7.1-alpine/Dockerfile
similarity index 100%
rename from misc/podman/test-qemu/test-qemu7-alpine/Dockerfile
rename to misc/podman/test-qemu/test-qemu-7.1-alpine/Dockerfile
diff --git a/misc/podman/test-qemu/test-qemu-8.0-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu-8.0-alpine/10-create-image.sh
new file mode 100755
index 00000000..76014206
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-8.0-alpine/10-create-image.sh
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# create the image from Dockerfile
+# using a rootless Podman container
+
+image=upx-test-qemu-8.0-alpine-20230725-v1
+[[ $1 == --print-image ]] && echo "$image" && exit 0
+
+podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
+
+podman image list "$image"
+echo
+podman image tree "$image"
diff --git a/misc/podman/test-qemu/test-qemu-8.0-alpine/11-list-packages.sh b/misc/podman/test-qemu/test-qemu-8.0-alpine/11-list-packages.sh
new file mode 100755
index 00000000..58445cc0
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-8.0-alpine/11-list-packages.sh
@@ -0,0 +1,19 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# list all system packages that are installed in the image
+# using a rootless Podman container
+
+image="$("$argv0dir/10-create-image.sh" --print-image)"
+
+podman image list "$image"
+echo
+podman image tree "$image"
+
+echo 'Packages:'
+flags=( --read-only --rm --pull=never )
+flags+=( --cap-drop=all )               # drop all capabilities
+flags+=( --network=none )               # no network needed
+podman run "${flags[@]}" "$image" bash -c $'apk info -v | sed \'s/ *$//\' | LC_ALL=C sort'
diff --git a/misc/podman/test-qemu/test-qemu-8.0-alpine/20-image-run-shell.sh b/misc/podman/test-qemu/test-qemu-8.0-alpine/20-image-run-shell.sh
new file mode 100755
index 00000000..d4f61f5d
--- /dev/null
+++ b/misc/podman/test-qemu/test-qemu-8.0-alpine/20-image-run-shell.sh
@@ -0,0 +1,41 @@
+#! /usr/bin/env bash
+## vim:set ts=4 sw=4 et:
+set -e; set -o pipefail
+argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
+
+# run an interactive shell in the image
+# using a rootless Podman container
+
+image="$("$argv0dir/10-create-image.sh" --print-image)"
+
+flags=( --read-only --rm --pull=never )
+flags+=( --cap-drop=all )               # drop all capabilities
+flags+=( --network=none )               # no network needed
+flags+=( -ti -e TERM="$TERM" )          # allocate an interactive pseudo-tty and pass $TERM
+if [[ 1 == 1 ]]; then
+    # run as user upx 2000:2000
+    flags+=( --user 2000 )
+    # map container users 0..999 to subuid-users 1..1000, and map container user 2000 to current host user
+    flags+=( --uidmap=0:1:1000 --uidmap=2000:0:1 )
+    # map container groups 0..999 to subgid-groups 1..1000, and map container group 2000 to current host group
+    flags+=( --gidmap=0:1:1000 --gidmap=2000:0:1 )
+    # NOTE: we mount the upx top-level directory read-write under /home/upx/src/upx
+    # INFO: SELinux users *may* have to add ":z" to the volume mount flags; check the docs!
+    flags+=( -v "${argv0dir}/../../../..:/home/upx/src/upx" )
+    flags+=( -w /home/upx/src/upx )     # set working directory
+    flags+=( --tmpfs /home/upx/.cache:rw,exec ) # mount a writeable tmpfs
+    flags+=( --tmpfs /home/upx/.local:rw,exec ) # mount a writeable tmpfs
+else
+    # run as user root 0:0
+    # ONLY FOR DEBUGGING THE IMAGE
+    # map container user/group 0 to current host user/group
+    flags+=( --user 0 )
+fi
+
+if [[ $# == 0 ]]; then
+    podman run "${flags[@]}" "$image" bash -l
+else
+    podman run "${flags[@]}" "$image" "$@"
+fi
+
+# please see usage instructions in ../README.md
diff --git a/misc/podman/test-qemu/test-qemu8-alpine/Dockerfile b/misc/podman/test-qemu/test-qemu-8.0-alpine/Dockerfile
similarity index 100%
rename from misc/podman/test-qemu/test-qemu8-alpine/Dockerfile
rename to misc/podman/test-qemu/test-qemu-8.0-alpine/Dockerfile
diff --git a/misc/podman/test-qemu/test-qemu6-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu6-alpine/10-create-image.sh
deleted file mode 100755
index 4d667bed..00000000
--- a/misc/podman/test-qemu/test-qemu6-alpine/10-create-image.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/bin/env bash
-## vim:set ts=4 sw=4 et:
-set -e; set -o pipefail
-argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
-
-# create the image from Dockerfile
-# using a rootless Podman container
-
-image=upx-test-qemu6-alpine-20230725-v1
-[[ $1 == --print-image ]] && echo "$image" && exit 0
-
-podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
-
-podman image list "$image"
-echo
-podman image tree "$image"
diff --git a/misc/podman/test-qemu/test-qemu7-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu7-alpine/10-create-image.sh
deleted file mode 100755
index 59a0bfee..00000000
--- a/misc/podman/test-qemu/test-qemu7-alpine/10-create-image.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/bin/env bash
-## vim:set ts=4 sw=4 et:
-set -e; set -o pipefail
-argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
-
-# create the image from Dockerfile
-# using a rootless Podman container
-
-image=upx-test-qemu7-alpine-20230725-v1
-[[ $1 == --print-image ]] && echo "$image" && exit 0
-
-podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
-
-podman image list "$image"
-echo
-podman image tree "$image"
diff --git a/misc/podman/test-qemu/test-qemu8-alpine/10-create-image.sh b/misc/podman/test-qemu/test-qemu8-alpine/10-create-image.sh
deleted file mode 100755
index d82da4d9..00000000
--- a/misc/podman/test-qemu/test-qemu8-alpine/10-create-image.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/bin/env bash
-## vim:set ts=4 sw=4 et:
-set -e; set -o pipefail
-argv0=$0; argv0abs="$(readlink -fn "$argv0")"; argv0dir="$(dirname "$argv0abs")"
-
-# create the image from Dockerfile
-# using a rootless Podman container
-
-image=upx-test-qemu8-alpine-20230725-v1
-[[ $1 == --print-image ]] && echo "$image" && exit 0
-
-podman build --squash -t "$image" -f "$argv0dir/Dockerfile" "$argv0dir"
-
-podman image list "$image"
-echo
-podman image tree "$image"