From 6ab84b5895ad6b5fb09b929076a3c6dd93a82d8e Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Sun, 15 Oct 2023 12:44:25 +0200
Subject: [PATCH] Fix podman detection in CI scripts

When docker-podman compat was set up in a way that causes "docker"
to be the argv[0] of podman, the previous detection did not work.
This was for example the case in the compat package from nixpkgs.

This checks the output and should work everywhere.
---
 src/ci/docker/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh
index 22aabda2bb3..99e3ce199f4 100755
--- a/src/ci/docker/run.sh
+++ b/src/ci/docker/run.sh
@@ -235,7 +235,7 @@ else
   args="$args --volume /tmp/toolstate:/tmp/toolstate"
 
   id=$(id -u)
-  if [[ "$id" != 0 && "$(docker -v)" =~ ^podman ]]; then
+  if [[ "$id" != 0 && "$(docker version)" =~ Podman ]]; then
     # Rootless podman creates a separate user namespace, where an inner
     # LOCAL_USER_ID will map to a different subuid range on the host.
     # The "keep-id" mode maps the current UID directly into the container.