From nobody Wed Feb 11 02:09:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529424430736443.50604224071856; Tue, 19 Jun 2018 09:07:10 -0700 (PDT) Received: from localhost ([::1]:43457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJ9x-0008EQ-VW for importer@patchew.org; Tue, 19 Jun 2018 12:07:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIvO-0004CK-1f for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIvE-0001nN-S8 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:05 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:39235) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIvE-0001ly-9E for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:51:56 -0400 Received: by mail-wr0-x230.google.com with SMTP id w7-v6so170761wrn.6 for ; Tue, 19 Jun 2018 08:51:56 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b14-v6sm11425wrn.57.2018.06.19.08.51.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:51:50 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1EA873E1139; Tue, 19 Jun 2018 16:44:40 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gmUYP4NWio58be30lOOjMYE5Li37ls87Zycph2WvLvQ=; b=jAh1TqVN22h1cTpyonEpS5Jj+Ui093Fv/CQTcUuduJKX0s5QZ7XeJR+SbjAqZERFhG al/aa5ZkbeLXgBZLImRoLJ1GwnjG0GCskV+BfPOu3+92890bNhCnXYVn9lEaZDFDubGN 69/UL7TVN8U+j8pyuh+jjqnrZLxKZ5xiCGpfc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gmUYP4NWio58be30lOOjMYE5Li37ls87Zycph2WvLvQ=; b=DjrmF+FBLa2Y3Iqxjmnpj7VA8MS9CP16YevoriVITXo2oiRIM71frI59GLRIRXfX54 asuEijuHwF2Evg8wfIjnBfeJwQhg6RAtnN+ZoMDm9vrSd4nGGDoEMddfRN1b2ZHUk1+m RHFVy5eievrM5/xy5oVaJtnJnAEPn38jOsqVA+3I/M30muu8aRxYE1R8brqMQ3oGMSyk Kdt5d1ulRuuL06g1MZwHwItLacA8PJxXOix8oM6MBjVC1zf+HRhwAa8Y6cVGSskIxq+C JfckHlVr9qneue9/OZblogrVyk6TAreHD1RaewqYBT3SIUWrqhq2RKAzMy77vmqY6agn Lqdg== X-Gm-Message-State: APt69E2qt/2XltQu5iP8TvUKvDJFLx75XYzkbrkut7bsw3YOIDgsWavu Pww6Zm4lb222R0H9eNokFHg0Dg== X-Google-Smtp-Source: ADUXVKIBKyFO1jYaW8opWK5uZepvnUs4OfxsWv5xHCVboDX15k+31TbxpYM9JNaqdC3Nf8p/L3eRyg== X-Received: by 2002:adf:f112:: with SMTP id r18-v6mr14160765wro.134.1529423515150; Tue, 19 Jun 2018 08:51:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:31 +0100 Message-Id: <20180619154435.18898-53-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::230 Subject: [Qemu-devel] [PULL 52/56] docker: docker.py add check sub-command 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: agraf@suse.de, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This command allows you to check if we need to re-build a docker image. If the image isn't in the repository or the checksums don't match then we return false and some text (for processing in makefiles). Signed-off-by: Alex Benn=C3=A9e --- - fix prints to be "modern" - PEP8 fixes - split inspect into function diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 0a0155c941..770b22424b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -181,8 +181,14 @@ class Docker(object): stderr=3Dsubprocess.STDOUT, **kwargs) =20 + def inspect_tag(self, tag): + try: + return self._output(["inspect", tag]) + except subprocess.CalledProcessError: + return None + def get_image_dockerfile_checksum(self, tag): - resp =3D self._output(["inspect", tag]) + resp =3D self.inspect_tag(tag) labels =3D json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") =20 @@ -444,6 +450,36 @@ class CcCommand(SubCommand): return Docker().command("run", cmd, args.quiet) =20 =20 +class CheckCommand(SubCommand): + """Check if we need to re-build a docker image out of a dockerfile. + Arguments: """ + name =3D "check" + + def args(self, parser): + parser.add_argument("tag", + help=3D"Image Tag") + parser.add_argument("dockerfile", + help=3D"Dockerfile name") + + def run(self, args, argv): + dockerfile =3D open(args.dockerfile, "rb").read() + tag =3D args.tag + + dkr =3D Docker() + info =3D dkr.inspect_tag(tag) + if info is None: + print("Image does not exist") + return 1 + + if dkr.image_matches_dockerfile(tag, dockerfile): + if not args.quiet: + print("Image is up to date") + return 0 + else: + print("Image needs updating") + return 1 + + def main(): parser =3D argparse.ArgumentParser(description=3D"A Docker helper", usage=3D"%s ..." % os.path.basename(sys.argv[0])) --=20 2.17.1