diff options
| author | Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> | 2023-10-15 12:44:25 +0200 |
|---|---|---|
| committer | Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> | 2023-10-15 13:27:59 +0200 |
| commit | 6ab84b5895ad6b5fb09b929076a3c6dd93a82d8e (patch) | |
| tree | fbe342561c075c4e214db0cce924f8a6aaf4a4d1 /src/ci | |
| parent | ff5664d600b7d31b43f1109587dabe008bb73af1 (diff) | |
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.
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/docker/run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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. |