mirror of https://github.com/proxmox/mirror_qemu
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>master
parent
504ca3c208
commit
920776ea5e
|
@ -221,6 +221,18 @@ class BuildCommand(SubCommand):
|
||||||
# Create a docker context directory for the build
|
# Create a docker context directory for the build
|
||||||
docker_dir = tempfile.mkdtemp(prefix="docker_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?
|
# Do we include a extra binary?
|
||||||
if args.include_executable:
|
if args.include_executable:
|
||||||
_copy_binary_with_libs(args.include_executable,
|
_copy_binary_with_libs(args.include_executable,
|
||||||
|
|
Loading…
Reference in New Issue