Skip to content

Commit

Permalink
Rollup merge of #116761 - Nilstrieb:podman, r=cuviper
Browse files Browse the repository at this point in the history
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.

I tested it locally by executing
```sh
if [[ "$id" != 0 && "$(docker version)" =~ Podman ]]; then
    echo yes
else
    echo no
fi
```
which printed `no` before, and `yes` now.

fixes #113129

r? cuviper
  • Loading branch information
fmease authored Oct 19, 2023
2 parents 2dd1c8f + 6ab84b5 commit 29d9877
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/ci/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 29d9877

Please sign in to comment.