Skip to content

Commit

Permalink
Run docker probe only if docker or podman are available
Browse files Browse the repository at this point in the history
The docker probe uses "sudo -n" which can cause an e-mail with a security warning
each time when configure is run. Therefore run docker probe only if either docker
or podman are available.

That avoids the problematic "sudo -n" on build environments which have neither
docker nor podman installed.

Fixes: c4575b5 ("configure: store container engine in config-host.mak")
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20221030083510.310584-1-sw@weilnetz.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20221111145529.4020801-2-alex.bennee@linaro.org>
  • Loading branch information
stweil authored and stsquad committed Nov 15, 2022
1 parent 98f10f0 commit e668923
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configure
Expand Up @@ -1780,7 +1780,7 @@ fi
# functions to probe cross compilers

container="no"
if test $use_containers = "yes"; then
if test $use_containers = "yes" && (has "docker" || has "podman"); then
case $($python "$source_path"/tests/docker/docker.py probe) in
*docker) container=docker ;;
podman) container=podman ;;
Expand Down

0 comments on commit e668923

Please sign in to comment.