Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4c886b6

Browse files
committedOct 15, 2023
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. Tested locally with `DEPLOY=1 bash src/ci/docker/run.sh dist-x86_64-linux` locally.
1 parent ff5664d commit 4c886b6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎src/ci/docker/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ else
235235
args="$args --volume /tmp/toolstate:/tmp/toolstate"
236236

237237
id=$(id -u)
238-
if [[ "$id" != 0 && "$(docker -v)" =~ ^podman ]]; then
238+
if [[ "$id" != 0 && "$(docker version)" =~ Podman ]]; then
239239
# Rootless podman creates a separate user namespace, where an inner
240240
# LOCAL_USER_ID will map to a different subuid range on the host.
241241
# The "keep-id" mode maps the current UID directly into the container.

0 commit comments

Comments
 (0)
Failed to load comments.