From 920776ea5ea3d9f243d266581da5345e5d7b2306 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alex=20Benn=C3=A9e?= Date: Tue, 19 Jul 2016 21:20:38 +0800 Subject: [PATCH] tests/docker/docker.py: check and run .pre script MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Message-id: 1468934445-32183-4-git-send-email-famz@redhat.com Signed-off-by: Fam Zheng --- tests/docker/docker.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 96d906e5be..76750c46d0 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.11.4.GIT