From patchwork Sat May 27 16:17:34 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: 9752023 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 56C416032C for ; Sat, 27 May 2017 16:22:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48C762521E for ; Sat, 27 May 2017 16:22:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D0C4283BB; Sat, 27 May 2017 16:22:29 +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 892D12521E for ; Sat, 27 May 2017 16:22:28 +0000 (UTC) Received: from localhost ([::1]:41355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEeTz-0000AD-P4 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 27 May 2017 12:22:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEeQ8-0006EG-DH for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEeQ7-0005g3-Iv for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:28 -0400 Received: from mail-oi0-x235.google.com ([2607:f8b0:4003:c06::235]:35011) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dEeQ7-0005fC-Dn for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:27 -0400 Received: by mail-oi0-x235.google.com with SMTP id l18so42730341oig.2 for ; Sat, 27 May 2017 09:18:27 -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=V2ML/PHmk6JeiK7IX2alWEzbLy5sU81OCNEGmkU6FW8=; b=fv5rVU+H9YWiQPWoXxCDIgXOhjdZJxHswHkN0DEHEDJXQjJREO3PjzcNnoc4RR5NOs M9HTQC8+3USDXpUiDdC+iYP3UdkJLvYD5iKZOdmEbulfYXiOJZzieWXnR/njAG7D0sTt w1Uu7fRYo3OJMrkSQKcHUBwHH/aZ7aD3YLCs8NyvnYYjMi4LxVPEb83LISgzEU3Q1pXv C0YJsDsaBoluL6iTmbukSIOx0UEciAT5jkDNPmmCgZ1oKFXqhuED/rZoHJ/p8ZRedXta n/KnL3dvaTEm+VSej9CbACIuKl/Kc492tT9MXkPF3ElLCBT+CAb2TzakxMuH5KnlCPIB ENgQ== 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=V2ML/PHmk6JeiK7IX2alWEzbLy5sU81OCNEGmkU6FW8=; b=sACjSdljQlbhaJSqtYEjro3p8D75E565zFMxdyHMVuK/pfZx/ISNCdzWfxdAnPM1DR PrpvSw2YL7jvkLnd2Lo4SIEdO+LgWPTzAGYcfDnBTpxcAKKABNZNGviTO17miicCHCqc nUibePHhao5AFAWciePhr7RQNeYKcRY6oN0SVXrpKIhCBC81qAauPe3XCG6w8yByehE5 2l7bZNvHZqQVZWeDCaSFxoai7Oq2yAefBe7dRzNzdiS45i/1vj9WXyjTHroeZ4HSjw+C J61D2qcuUtcF47aD15wEuEcURiYvqK4IxBwn/dH1aoPo3wVvSWRMWwDD2r57OPyAe31J EZ1Q== X-Gm-Message-State: AODbwcCcXdvJNZ8biSkm1cNe18J8Vet0FaBK2qHi0tvpMJ2HJECEOZ0a +77xQm1aS0Ill88SGJA= X-Received: by 10.202.108.15 with SMTP id h15mr3076373oic.3.1495901906612; Sat, 27 May 2017 09:18:26 -0700 (PDT) Received: from yoga.attlocal.net (162-231-236-127.lightspeed.miamfl.sbcglobal.net. [162.231.236.127]) by smtp.gmail.com with ESMTPSA id i32sm1953113otd.43.2017.05.27.09.18.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 May 2017 09:18:26 -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: Sat, 27 May 2017 13:17:34 -0300 Message-Id: <20170527161755.7761-4-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170527161755.7761-1-f4bug@amsat.org> References: <20170527161755.7761-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::235 Subject: [Qemu-devel] [PATCH v4 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 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)