From patchwork Fri Jun 2 18:56:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 9763207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 011DB60360 for ; Fri, 2 Jun 2017 19:00:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7AC3285AE for ; Fri, 2 Jun 2017 19:00:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC1BE285B8; Fri, 2 Jun 2017 19:00:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5A1B3285AE for ; Fri, 2 Jun 2017 19:00:56 +0000 (UTC) Received: from localhost ([::1]:51143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGrod-0004ph-FQ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 02 Jun 2017 15:00:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGrks-0001vU-S7 for qemu-devel@nongnu.org; Fri, 02 Jun 2017 14:57:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGrks-0006E3-0r for qemu-devel@nongnu.org; Fri, 02 Jun 2017 14:57:02 -0400 Received: from mail-oi0-x234.google.com ([2607:f8b0:4003:c06::234]:36339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dGrkr-0006Dv-SR for qemu-devel@nongnu.org; Fri, 02 Jun 2017 14:57:01 -0400 Received: by mail-oi0-x234.google.com with SMTP id h4so102671415oib.3 for ; Fri, 02 Jun 2017 11:57:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z7XLiURzxiTLorWDNUtV3ccDc3szUFb7T7bjgkdtbJI=; b=rhXV5xavgf8fk47YD4+Zb+Op894FMcuYaadwc0aYtrtqDdQ5/MeQf0gNNdDd5h1ZUX /jy64szA8SxRzxS3InV+3EbtdBJZJS84Ic6tdIxxBiLe3hEOoGTkH1hZxhuqAwksJJaF dMeQslRL3770Tuwq4mBvsY8G3Q1hyBQnMETQLhZ4AYB/mYG16ZartpsxBpTREBB8J5Zb 79Nrq4Uummufr9tv/gFVIiAkwzCmO6dl+UmASdW/peh3VFNgcP+zCy5S/MfwQlv8UtJb XtE+NDtJUPc57CPRjWnHDgZi5weFz5htGJESoKHtp5mFuzQjbSLBRDa1BfXftHdXv24j 9tKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Z7XLiURzxiTLorWDNUtV3ccDc3szUFb7T7bjgkdtbJI=; b=grcKtNZRCdeJ1MKmEOkEwkeutnCOZEigQjoR30cjO5S0WU++ZnCncF2zgy6AoGOPuP WHrGs7Qlrw1tanNINEXXzR3iCwxxFca/TX6O/qdN09nJr+8oMkIkcnqtdN5j/fQtPOUl pH5Zj5uaftCZHM0pSPf6nyDppCRKH8W3f6GnexqZBo/WaHAgXIytl0Y5T/+YSiRR+2hM ykrrIt0DW3OTBBUlMncO7TteXbZTaL/vhVJRgN2glkTs1kwM/U/bWLIcT14JZVdMmXY/ 4fstg7o2xdqx54O9QvPFntgFgPqw+WCGPHci3Hya3jRfl3OUlzqJ63nBpmuN+wDTYjs9 NQWQ== X-Gm-Message-State: AODbwcDP+6Jw1I+9rd1VG/vdYF4ez1yt3mv09y0D5w1mOe/tNdzbRAZQ Lq/EDEBufk5td4lVnWvJeg== X-Received: by 10.157.36.132 with SMTP id z4mr4666378ota.158.1496429821013; Fri, 02 Jun 2017 11:57:01 -0700 (PDT) Received: from yoga.attlocal.net ([2602:30a:2c37:1a00::43]) by smtp.gmail.com with ESMTPSA id z2sm1345048ota.1.2017.06.02.11.56.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 11:56:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Fri, 2 Jun 2017 15:56:09 -0300 Message-Id: <20170602185630.5059-4-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170602185630.5059-1-f4bug@amsat.org> References: <20170602185630.5059-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::234 Subject: [Qemu-devel] [PATCH v5 03/24] docker: rebuild image if 'extra files' checksum does not match X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 10fa907905..e707e5bcca 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 + \ @@ -276,16 +280,22 @@ class BuildCommand(SubCommand): # Copy any extra files into the Docker context. These can be # included by the use of the ADD directive in 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)