diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-05 17:06:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-05 17:06:23 +0100 |
| commit | c1c2a435905ae76b159c573b0c0d6f095b45ebc6 (patch) | |
| tree | cb8ccfb20c3397cade36263c3fbde7955f52f6b7 /tests/docker/docker.py | |
| parent | 1d889f2a8baaa265939b339d2f52ec57f5b8a09c (diff) | |
| parent | 36dc5fedab0339afdeb3c40ff820c7e5ce334751 (diff) | |
| download | focaccia-qemu-c1c2a435905ae76b159c573b0c0d6f095b45ebc6.tar.gz focaccia-qemu-c1c2a435905ae76b159c573b0c0d6f095b45ebc6.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-docker-updates-050618-1' into staging
Docker related updates - configure/probe for docker - TARGET_DIRS -> TARGET_LIST cleanup - new fedora-i386-cross and debian/tricore images - test-mingw use SDL2/GTK3 # gpg: Signature made Tue 05 Jun 2018 16:32:53 BST # gpg: using RSA key FBD0DB095A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" # Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 * remotes/stsquad/tags/pull-docker-updates-050618-1: docker: add debian/tricore image docker: test-mingw: use SDL2 and GTK+3 docker: Add fedora-i386-cross image Makefile: Rename TARGET_DIRS to TARGET_LIST configure: add test for docker availability docker: add "probe" command for configure Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/docker/docker.py')
| -rwxr-xr-x | tests/docker/docker.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 1246ba9578..f8267586eb 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -390,6 +390,24 @@ class ImagesCommand(SubCommand): def run(self, args, argv): return Docker().command("images", argv, args.quiet) + +class ProbeCommand(SubCommand): + """Probe if we can run docker automatically""" + name = "probe" + + def run(self, args, argv): + try: + docker = Docker() + if docker._command[0] == "docker": + print "yes" + elif docker._command[0] == "sudo": + print "sudo" + except Exception: + print "no" + + return + + def main(): parser = argparse.ArgumentParser(description="A Docker helper", usage="%s <subcommand> ..." % os.path.basename(sys.argv[0])) |