[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 50/56] docker: docker.py use "version" to probe usage
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 50/56] docker: docker.py use "version" to probe usage |
Date: |
Tue, 19 Jun 2018 16:44:29 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PULL 36/56] tests/tcg: enable building for m68k, (continued)
- [Qemu-devel] [PULL 36/56] tests/tcg: enable building for m68k, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 47/56] tests/tcg: override runners for broken tests, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 39/56] tests/tcg: enable building for mips64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 55/56] tests/docker/Makefile.include: only force SID to NOCACHE if old, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 48/56] tests/tcg/i386: extend timeout for runcom test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 52/56] docker: docker.py add check sub-command, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 41/56] docker: move debian-powerpc-cross to sid based build, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 43/56] tests/tcg/Makefile: update to be called from Makefile.target, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 40/56] tests/tcg: enable building for RISCV64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 38/56] tests/tcg: enable building for sparc64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 50/56] docker: docker.py use "version" to probe usage,
Alex Bennée <=
- [Qemu-devel] [PULL 49/56] tests: add top-level make dependency for docker builds, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 54/56] docker: docker.py adding age check command, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 35/56] tests/tcg: enable building for HPPA, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 15/56] tests/tcg: enable building for i386, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 26/56] tests/tcg/arm: add fcvt test cases for AArch32/64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 29/56] tests/docker/Makefile.include: fix mipsel-cross dependancy, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 21/56] tests/tcg/i386/test-i386: fix printf format, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 42/56] tests/tcg: enable building for PowerPC, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 53/56] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 19/56] tests/tcg/x86_64: add Makefile.target, Alex Bennée, 2018/06/19