[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/10] tests/docker/docker.py: check and run .pre scr
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 03/10] tests/docker/docker.py: check and run .pre script |
Date: |
Tue, 19 Jul 2016 22:31:10 +0800 |
From: Alex Bennée <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Fam Zheng <address@hidden>
---
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
- [Qemu-devel] [PULL 00/10] Docker patches, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 01/10] tests/docker/docker.py: docker_dir outside build, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 02/10] tests/docker/docker.py: support --include-executable, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 03/10] tests/docker/docker.py: check and run .pre script,
Fam Zheng <=
- [Qemu-devel] [PULL 07/10] docker: Fix exit code if $CMD failed, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 08/10] docker: Add "images" subcommand to docker.py, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 09/10] docker: Don't start a container that doesn't exist, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 06/10] docker: More sensible run script, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 04/10] tests/docker/dockerfiles: new debian-bootstrap.docker, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 10/10] docker: pass EXECUTABLE to build script, Fam Zheng, 2016/07/19
- [Qemu-devel] [PULL 05/10] tests/docker/docker.py: add update operation, Fam Zheng, 2016/07/19
- Re: [Qemu-devel] [PULL 00/10] Docker patches, Peter Maydell, 2016/07/20