From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, berrange@redhat.com,
"Alex Bennée" <alex.bennee@linaro.org>,
"Fam Zheng" <famz@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [Qemu-devel] [PULL 1/6] docker: add "probe" command for configure
Date: Tue, 5 Jun 2018 17:05:36 +0100 [thread overview]
Message-ID: <20180605160541.10664-2-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180605160541.10664-1-alex.bennee@linaro.org>
This is a helper function for the configure script. It replies yes,
sudo or no to inform the user if non-interactive docker support is
available. We trap the Exception to fail gracefully.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
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]))
--
2.17.0
next prev parent reply other threads:[~2018-06-05 16:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 16:05 [Qemu-devel] [PULL 0/6] Some docker updates Alex Bennée
2018-06-05 16:05 ` Alex Bennée [this message]
2018-06-05 16:05 ` [Qemu-devel] [PULL 2/6] configure: add test for docker availability Alex Bennée
2018-06-05 16:05 ` [Qemu-devel] [PULL 3/6] Makefile: Rename TARGET_DIRS to TARGET_LIST Alex Bennée
2018-06-28 16:11 ` Paolo Bonzini
2018-06-28 16:27 ` Alex Bennée
2018-06-29 12:06 ` Alex Bennée
2018-06-05 16:05 ` [Qemu-devel] [PULL 4/6] docker: Add fedora-i386-cross image Alex Bennée
2018-06-05 16:05 ` [Qemu-devel] [PULL 5/6] docker: test-mingw: use SDL2 and GTK+3 Alex Bennée
2018-06-05 16:05 ` [Qemu-devel] [PULL 6/6] docker: add debian/tricore image Alex Bennée
2018-06-07 7:59 ` [Qemu-devel] [PULL 0/6] Some docker updates Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180605160541.10664-2-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).