[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/10] tests/docker/docker.py: docker_dir outside bui
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 01/10] tests/docker/docker.py: docker_dir outside build |
Date: |
Tue, 19 Jul 2016 22:31:08 +0800 |
From: Alex Bennée <address@hidden>
Instead of letting the build_image create the temporary working dir we
move the creation to the build command. This is preparation for the
later patches where additional files can be added to the build context
before the build step is run.
We also ensure we remove the build context after we are done (mkdtemp
doesn't do this automatically for you).
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Fam Zheng <address@hidden>
---
tests/docker/docker.py | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 0151362..ae40bb3 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -20,7 +20,7 @@ import atexit
import uuid
import argparse
import tempfile
-from shutil import copy
+from shutil import copy, rmtree
def _text_checksum(text):
"""Calculate a digest string unique to the text content"""
@@ -87,20 +87,20 @@ class Docker(object):
labels = json.loads(resp)[0]["Config"].get("Labels", {})
return labels.get("com.qemu.dockerfile-checksum", "")
- def build_image(self, tag, dockerfile, df_path, quiet=True, argv=None):
+ def build_image(self, tag, docker_dir, dockerfile, quiet=True, argv=None):
if argv == None:
argv = []
- tmp_dir = tempfile.mkdtemp(prefix="docker_build")
- tmp_df = tempfile.NamedTemporaryFile(dir=tmp_dir, suffix=".docker")
+ tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker")
tmp_df.write(dockerfile)
tmp_df.write("\n")
tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" %
_text_checksum(dockerfile))
tmp_df.flush()
+
self._do(["build", "-t", tag, "-f", tmp_df.name] + argv + \
- [tmp_dir],
+ [docker_dir],
quiet=quiet)
def image_matches_dockerfile(self, tag, dockerfile):
@@ -164,10 +164,15 @@ class BuildCommand(SubCommand):
if dkr.image_matches_dockerfile(tag, dockerfile):
if not args.quiet:
print "Image is up to date."
- return 0
+ else:
+ # Create a docker context directory for the build
+ docker_dir = tempfile.mkdtemp(prefix="docker_build")
+
+ dkr.build_image(tag, docker_dir, dockerfile,
+ quiet=args.quiet, argv=argv)
+
+ rmtree(docker_dir)
- dkr.build_image(tag, dockerfile, args.dockerfile,
- quiet=args.quiet, argv=argv)
return 0
class CleanCommand(SubCommand):
--
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 <=
- [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, 2016/07/19
- [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