aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2018-06-18 11:14:40 +0100
committerAlex Bennée <alex.bennee@linaro.org>2018-06-20 22:13:39 +0100
commit83405c4517679722257b1560f75fb7488b671374 (patch)
treead557d3c0b999a71a8c6a6c61743edfc1e29f28c
parent1a7fab926b3d9913149f3a859185cee7f27f767a (diff)
docker: docker.py use "version" to probe usage
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.bennee@linaro.org>
-rwxr-xr-xtests/docker/docker.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index b28ad87034..e6437d64a7 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -52,7 +52,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: