[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 03/24] docker: rebuild image if 'extra files'
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH v4 03/24] docker: rebuild image if 'extra files' checksum does not match |
Date: |
Wed, 31 May 2017 17:32:40 +0100 |
User-agent: |
mu4e 0.9.19; emacs 25.2.50.2 |
Philippe Mathieu-Daudé <address@hidden> writes:
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
> ---
> tests/docker/docker.py | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/tests/docker/docker.py b/tests/docker/docker.py
> index 5401e58fce..b5ee8bd6e3 100755
> --- a/tests/docker/docker.py
> +++ b/tests/docker/docker.py
> @@ -38,6 +38,9 @@ def _text_checksum(text):
> """Calculate a digest string unique to the text content"""
> return hashlib.sha1(text).hexdigest()
>
> +def _file_checksum(filename):
> + return _text_checksum(open(filename, 'rb').read())
> +
> def _guess_docker_command():
> """ Guess a working docker command or raise exception if not found"""
> commands = [["docker"], ["sudo", "-n", "docker"]]
> @@ -154,7 +157,7 @@ class Docker(object):
> return labels.get("com.qemu.dockerfile-checksum", "")
>
> def build_image(self, tag, docker_dir, dockerfile,
> - quiet=True, user=False, argv=None):
> + quiet=True, user=False, argv=None, extra_files_cksum=[]):
> if argv == None:
> argv = []
>
> @@ -170,7 +173,8 @@ class Docker(object):
>
> tmp_df.write("\n")
> tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" %
> - _text_checksum(dockerfile))
> + _text_checksum("\n".join([dockerfile] +
> + extra_files_cksum)))
> tmp_df.flush()
>
> self._do(["build", "-t", tag, "-f", tmp_df.name] + argv + \
> @@ -275,16 +279,22 @@ class BuildCommand(SubCommand):
> return 1
>
> # Include files used by ADD directives found within the
> Dockerfile.
> + cksum = []
> if args.include_executable:
> + # FIXME: there is no checksum of this executable and the
> linked
> + # libraries, once the image built any change of this
> executable
> + # or any library won't trigger another build.
> _copy_binary_with_libs(args.include_executable, docker_dir)
> for filename in args.extra_files or []:
> _copy_with_mkdir(filename, docker_dir)
> + cksum += [_file_checksum(filename)]
>
> argv += ["--build-arg=" + k.lower() + "=" + v
> for k, v in os.environ.iteritems()
> if k.lower() in FILTERED_ENV_NAMES]
> dkr.build_image(tag, docker_dir, dockerfile,
> - quiet=args.quiet, user=args.user, argv=argv)
> + quiet=args.quiet, user=args.user, argv=argv,
> + extra_files_cksum=cksum)
>
> rmtree(docker_dir)
--
Alex Bennée
- [Qemu-devel] [PATCH v4 00/24] docker/shippable: cross-build mipsel and powerpc targets, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 01/24] docker: let _copy_with_mkdir() sub_path argument be optional, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 02/24] docker: add --include-files argument to 'build' command, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 03/24] docker: rebuild image if 'extra files' checksum does not match, Philippe Mathieu-Daudé, 2017/05/27
- Re: [Qemu-devel] [PATCH v4 03/24] docker: rebuild image if 'extra files' checksum does not match,
Alex Bennée <=
- [Qemu-devel] [PATCH v4 04/24] docker: add 'apt-fake' script which generate fake debian packages, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 05/24] docker: install ca-certificates package in base image, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 06/24] docker: create deb-src entry and setup Emdebian in the same layer, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 08/24] docker: use eatmydata, install common build packages in base image, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 10/24] docker: use eatmydata in debian arm64 image, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 09/24] docker: use eatmydata in debian armhf image, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 07/24] docker: use better regex to generate deb-src entries, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 11/24] docker: add extra libs to armhf target to extend codebase coverage, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 12/24] docker: add extra libs to arm64 target to extend codebase coverage, Philippe Mathieu-Daudé, 2017/05/27
- [Qemu-devel] [PATCH v4 13/24] docker: add extra libs to s390x target to extend codebase coverage, Philippe Mathieu-Daudé, 2017/05/27