From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, famz@redhat.com
Subject: [Qemu-devel] [PULL 03/10] tests/docker/docker.py: check and run .pre script
Date: Tue, 19 Jul 2016 22:31:10 +0800 [thread overview]
Message-ID: <1468938677-15607-4-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1468938677-15607-1-git-send-email-famz@redhat.com>
From: Alex Bennée <alex.bennee@linaro.org>
The docker script will now search for an associated $dockerfile.pre
script which gets run in the same build context as the dockerfile will
be. This is to support pre-seeding the build context before running the
docker build.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1468934445-32183-4-git-send-email-famz@redhat.com
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/docker.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 96d906e..76750c4 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -221,6 +221,18 @@ class BuildCommand(SubCommand):
# Create a docker context directory for the build
docker_dir = tempfile.mkdtemp(prefix="docker_build")
+ # Is there a .pre file to run in the build context?
+ docker_pre = os.path.splitext(args.dockerfile)[0]+".pre"
+ if os.path.exists(docker_pre):
+ rc = subprocess.call(os.path.realpath(docker_pre),
+ cwd=docker_dir)
+ if rc == 3:
+ print "Skip"
+ return 0
+ elif rc != 0:
+ print "%s exited with code %d" % (docker_pre, rc)
+ return 1
+
# Do we include a extra binary?
if args.include_executable:
_copy_binary_with_libs(args.include_executable,
--
2.7.4
next prev parent reply other threads:[~2016-07-19 14:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-19 14:31 [Qemu-devel] [PULL 00/10] Docker patches Fam Zheng
2016-07-19 14:31 ` [Qemu-devel] [PULL 01/10] tests/docker/docker.py: docker_dir outside build Fam Zheng
2016-07-19 14:31 ` [Qemu-devel] [PULL 02/10] tests/docker/docker.py: support --include-executable Fam Zheng
2016-07-19 14:31 ` Fam Zheng [this message]
2016-07-19 14:31 ` [Qemu-devel] [PULL 04/10] tests/docker/dockerfiles: new debian-bootstrap.docker Fam Zheng
2016-07-19 14:31 ` [Qemu-devel] [PULL 05/10] tests/docker/docker.py: add update operation Fam Zheng
2016-07-19 14:31 ` [Qemu-devel] [PULL 06/10] docker: More sensible run script Fam Zheng
2016-07-19 14:31 ` [Qemu-devel] [PULL 07/10] docker: Fix exit code if $CMD failed Fam Zheng
2016-07-19 14:31 ` [Qemu-devel] [PULL 08/10] docker: Add "images" subcommand to docker.py Fam Zheng
2016-07-19 14:31 ` [Qemu-devel] [PULL 09/10] docker: Don't start a container that doesn't exist Fam Zheng
2016-08-02 18:59 ` Paolo Bonzini
2016-08-03 2:50 ` Fam Zheng
2016-07-19 14:31 ` [Qemu-devel] [PULL 10/10] docker: pass EXECUTABLE to build script Fam Zheng
2016-07-20 10:31 ` [Qemu-devel] [PULL 00/10] Docker patches Peter Maydell
2016-07-20 10:55 ` Fam Zheng
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=1468938677-15607-4-git-send-email-famz@redhat.com \
--to=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).