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>
This commit is contained in:
parent
1a7fab926b
commit
83405c4517
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user