diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2016-07-19 21:20:38 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2016-07-20 19:19:43 +0800 |
| commit | 920776ea5ea3d9f243d266581da5345e5d7b2306 (patch) | |
| tree | 779cdd6717384fd4495cfe0d81fc55bcb31f3f4b /tests/docker | |
| parent | 504ca3c208da7b2ea657b62db146e1e5de74df0f (diff) | |
| download | qemu-920776ea5ea3d9f243d266581da5345e5d7b2306.zip qemu-920776ea5ea3d9f243d266581da5345e5d7b2306.tar.gz qemu-920776ea5ea3d9f243d266581da5345e5d7b2306.tar.bz2 | |
tests/docker/docker.py: check and run .pre script
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>
Diffstat (limited to 'tests/docker')
| -rwxr-xr-x | tests/docker/docker.py | 12 |
1 files changed, 12 insertions, 0 deletions
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, |