summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorStefan Weil2022-11-17 18:25:20 +0100
committerAlex Bennée2022-11-22 10:48:52 +0100
commit47fdc8fb82fc8dd182b4923a69cefadc87419e0d (patch)
tree32be29592f27b27a524b42bdce19cf6f08b327f3 /configure
parentrtl8139: honor large send MSS value (diff)
downloadqemu-47fdc8fb82fc8dd182b4923a69cefadc87419e0d.tar.gz
qemu-47fdc8fb82fc8dd182b4923a69cefadc87419e0d.tar.xz
qemu-47fdc8fb82fc8dd182b4923a69cefadc87419e0d.zip
Run docker probe only if docker or podman are available
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: c4575b59155e2e00 ("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: <20221117172532.538149-2-alex.bennee@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 66928692b0..26c7bc5154 100755
--- a/configure
+++ b/configure
@@ -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 ;;