On 11/11/2022 15.55, Alex Bennée wrote:
From: Stefan Weil <s...@weilnetz.de>

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 <s...@weilnetz.de>
Message-Id: <20221030083510.310584-1...@weilnetz.de>
Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
  configure | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

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 ;;

Maybe the probe should better be done in the docker.py script instead? ... but doing it here likely does not hurt either, so:

Reviewed-by: Thomas Huth <th...@redhat.com>


Reply via email to