From patchwork Sun May 21 03:29:35 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: 9738817 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 DD77160392 for ; Sun, 21 May 2017 03:31:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D090628598 for ; Sun, 21 May 2017 03:31:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C55E328637; Sun, 21 May 2017 03:31:53 +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 C0CA128598 for ; Sun, 21 May 2017 03:31:51 +0000 (UTC) Received: from localhost ([::1]:36150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCHaw-0001LV-ED for patchwork-qemu-devel@patchwork.kernel.org; Sat, 20 May 2017 23:31:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCHZX-0001Ju-3r for qemu-devel@nongnu.org; Sat, 20 May 2017 23:30:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dCHZW-0007Cs-9x for qemu-devel@nongnu.org; Sat, 20 May 2017 23:30:23 -0400 Received: from mail-oi0-x230.google.com ([2607:f8b0:4003:c06::230]:35543) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dCHZW-0007CJ-5J for qemu-devel@nongnu.org; Sat, 20 May 2017 23:30:22 -0400 Received: by mail-oi0-x230.google.com with SMTP id l18so129363641oig.2 for ; Sat, 20 May 2017 20:30:22 -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=lGwRKHDbyT4zUF0AUlzCJ8jmXVRCoGxTJm80ilX9Bqc=; b=rWihVgQrtHinqxWSN1iUZtTCIp8gp6iUS7ptCLlo8aMW8r8PCFr4fzXcOBypq9QtX4 HkDmFfNsuWGcvoM0C4OTjiOe9TbprJ33h/PjHG0paUcpt1E7jGbT5R2nxVQWOvq90KF2 4RHkSMwle2y7i1egvWKyvBS23umshkKYXXXMzDr3K9j388/EJflPjf5+/bLSs4jEsppW K5JY4ki1zFmb6hkN92gG41liidLFlPH6QSqc0YPEN5p/5ADnum25S7ri1n8CPaqcZTyv o/nrzsV86hQSOU5oYrK/JCfePXU6M+n8m9DGtCzmth3fLhXIUA/Y8TAi1bZXdA0TnZ0s 0OVw== 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=lGwRKHDbyT4zUF0AUlzCJ8jmXVRCoGxTJm80ilX9Bqc=; b=tbY7E7D/XssHxC/GyDNeYamymMCs/M8M5jc50R8q6WplclV6yJ6kBLK0Lre136MXs2 UekIBWFDBWvrl2dnRbdZhAE1l7wrxNp4Qn6la9je4m9bARhY2UubzQmyPTqL+zeoehvC ClIEommZ34yW3S9pWQdq1j/QB/FDMtxcHpmO8upPQrXY/jsePrY60FNe1YkU1TQ8j8lU OKCxrZhLlfxQhNnqKsmeEBVq9bJfvLbsmXUzBiwffr5INQKESRkLfvlJrS7RKDErKWD7 WnjuJlSKIQZpomMDHbJzgvY15Zx4J8sYYMhQ7EoHr/o/FVSsX9P7CmU336EhoAZ6BGMJ 4KdQ== X-Gm-Message-State: AODbwcCLOyg4yumOTm+XX9rRFMJRhtwFre0X1XCe5dc3Y2xzuUtROC/m xyQojpm5VUze3Q== X-Received: by 10.202.114.131 with SMTP id p125mr9315620oic.104.1495337421487; Sat, 20 May 2017 20:30:21 -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 u23sm6499219otg.31.2017.05.20.20.30.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 May 2017 20:30:20 -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: Sun, 21 May 2017 00:29:35 -0300 Message-Id: <20170521032956.27446-4-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170521032956.27446-1-f4bug@amsat.org> References: <20170521032956.27446-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::230 Subject: [Qemu-devel] [PATCH v3 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é --- tests/docker/docker.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index eef92a54f1..0dd6a3304f 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,7 @@ class Docker(object): tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % - _text_checksum(dockerfile)) + _text_checksum(dockerfile + "-".join(extra_files_cksum))) tmp_df.flush() self._do(["build", "-t", tag, "-f", tmp_df.name] + argv + \ @@ -276,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.include_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)