From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dG6Xw-0000Ri-DY for qemu-devel@nongnu.org; Wed, 31 May 2017 12:32:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dG6Xs-0003th-5U for qemu-devel@nongnu.org; Wed, 31 May 2017 12:32:32 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:37244) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dG6Xr-0003tF-UI for qemu-devel@nongnu.org; Wed, 31 May 2017 12:32:28 -0400 Received: by mail-wm0-x229.google.com with SMTP id d127so26594212wmf.0 for ; Wed, 31 May 2017 09:32:27 -0700 (PDT) References: <20170527161755.7761-1-f4bug@amsat.org> <20170527161755.7761-4-f4bug@amsat.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <20170527161755.7761-4-f4bug@amsat.org> Date: Wed, 31 May 2017 17:32:40 +0100 Message-ID: <87tw41rnpz.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 03/24] docker: rebuild image if 'extra files' checksum does not match List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: qemu-devel@nongnu.org, Fam Zheng Philippe Mathieu-Daudé writes: > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée > --- > 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