The "images" command is a fairly heavyweight command to run as it involves searching the whole docker file-system inventory. On a machine with a lot of images this makes start-up fairly expensive.
Signed-off-by: Alex Bennée <alex.ben...@linaro.org> --- v8 - use version instead of ps, add comment diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c83fd89985..e6685f6d81 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -49,7 +49,9 @@ def _guess_docker_command(): commands = [["docker"], ["sudo", "-n", "docker"]] for cmd in commands: try: - if subprocess.call(cmd + ["images"], + # docker version will return the client details in stdout + # but still report a status of 1 if it can't contact the daemon + if subprocess.call(cmd + ["version"], stdout=DEVNULL, stderr=DEVNULL) == 0: return cmd except OSError: -- 2.17.1