[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 3/7] tests/docker/docker.py: check and run .pre s
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v5 3/7] tests/docker/docker.py: check and run .pre script |
Date: |
Tue, 12 Jul 2016 16:00:35 +0100 |
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>
---
v3
- new for v3, split from previous patch
- use check_call when running the pre-script
---
tests/docker/docker.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 96d906e..244901d 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -221,6 +221,12 @@ 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):
+ subprocess.check_call(os.path.realpath(docker_pre),
+ cwd=docker_dir)
+
# Do we include a extra binary?
if args.include_executable:
_copy_binary_with_libs(args.include_executable,
--
2.7.4
- [Qemu-devel] [PATCH v5 0/7] docker: Support building qemu-user powered docker test images, Alex Bennée, 2016/07/12
- [Qemu-devel] [PATCH v5 3/7] tests/docker/docker.py: check and run .pre script,
Alex Bennée <=
- [Qemu-devel] [PATCH v5 2/7] tests/docker/docker.py: support --include-executable, Alex Bennée, 2016/07/12
- [Qemu-devel] [PATCH v5 5/7] tests/docker/docker.py: add update operation, Alex Bennée, 2016/07/12
- [Qemu-devel] [PATCH v5 1/7] tests/docker/docker.py: docker_dir outside build, Alex Bennée, 2016/07/12
- [Qemu-devel] [PATCH v5 6/7] docker: More sensible run script, Alex Bennée, 2016/07/12
- [Qemu-devel] [PATCH v5 4/7] tests/docker/dockerfiles: new debian-bootstrap.docker, Alex Bennée, 2016/07/12
- [Qemu-devel] [PATCH v5 7/7] docker: Fix exit code if $CMD failed, Alex Bennée, 2016/07/12
- Re: [Qemu-devel] [PATCH v5 0/7] docker: Support building qemu-user powered docker test images, Alex Bennée, 2016/07/18