From patchwork Mon Jun 18 13:07:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 138936 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3939958lji; Mon, 18 Jun 2018 06:14:12 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIDXgXI9bpY7W2gmXguG0EB4Kdtxl4dfwM827A96q2zXlcOWF6IV0oGri/34eL51jFvS0Hm X-Received: by 2002:ac8:94b:: with SMTP id z11-v6mr10977744qth.340.1529327643383; Mon, 18 Jun 2018 06:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529327643; cv=none; d=google.com; s=arc-20160816; b=Fg8YHnDfLZ8n0tN9/NibR2sWIavPB9Gc34COwWYgipQCDD5iJLEOLvYVjqMki6kT8I UGUW2Xb1f4PuAz8erlTuVwBUBj61ahd8EVlYO78ROek/E6tdcaXPSjZq5TFPSYUz7kpj I4cLMBIKO/dvFlFS0pi4NQWk5WY3Ot7JhgrViZnlLGUnthyir5q7YbF6aP2y3GdKBD4F ibHh1ebKKFD8NUtF38WHStSF4MVh+j88nLH7F4sIY6d/sWVCSzGXNP3oPWCVjfLM5x1q MzFc4ubQG8EXCP0GsVXhnNS1wmh7nFDSu/4dkFM4DugksC6h25kifh7wn1nJBv7RJJqh P2bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=RTAVjkJnifp60KE2wcnTtu+icpE6wvJBzFNFLwcUhtY=; b=ZnXcrWgslCoLJEwWkGpHg8W0K8+tHYTT975SJYTUL1TDAqOMJztWxK3ZC/hipSx55B D8tr20xzKxKZrBpmaHBM2E6rL5XmlaOi4+46CV3gnfn60rXfeb4eAmEZJiF3bG1CbnkF cBC1jDBkW+c6WnBJRq0AVPU5pEZwUqQNhs5l68qFj461JW4vrGh68NVNulqd4vNq9U7J r6y11g65X2TCusIFAUC0JA36iU+BGQ6gIRZyn6GIpNjl2MUmrUuQB7IxheUklVxm6qy8 SzzHutPVgq3aoB8aXFu6kwJ2ZDVtMC0Es9Zu/iljE9SiX57VSP3gr49av6Vqjiu32PW+ byCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b6svZQ0d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i49-v6si1921361qvi.207.2018.06.18.06.14.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 18 Jun 2018 06:14:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b6svZQ0d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtys-0002wI-S3 for patch@linaro.org; Mon, 18 Jun 2018 09:14:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUtsO-0005yi-9N for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUtsN-0002gE-Co for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:20 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:37870) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUtsN-0002fl-4Z for qemu-devel@nongnu.org; Mon, 18 Jun 2018 09:07:19 -0400 Received: by mail-wr0-x22a.google.com with SMTP id d8-v6so16781852wro.4 for ; Mon, 18 Jun 2018 06:07:19 -0700 (PDT) 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=RTAVjkJnifp60KE2wcnTtu+icpE6wvJBzFNFLwcUhtY=; b=b6svZQ0dj5wXGhmspS+IMhmUl7yB3xlT8O5zRDFcNVrMReYVGUhEEWsesMBQbgGQSO SuT/YVgHvjosxYeQUW1mP9K7/dEaKVWIgOwoqUGVqThWliDwtcxuw2yiuaRLesofze+T UXuy0Hx2WZ/wViiYBxxXyjAYsza1qXqv9I6DE= 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=RTAVjkJnifp60KE2wcnTtu+icpE6wvJBzFNFLwcUhtY=; b=hXWDA7fx8Qmxioi+cFZJAg5xz8bUuartjZIu9rctY1bEjOxPmBdlcbVt9BZgSqII1w aTjBKof6P9oLiD1s/kD36umLhFqDZoQpxfZpXA5T9QaB1qAL6agM0WymKycShp9VUsSr EdNc9nbsuMEmusjCKpT8KT8AaJvbjVI0vxtS3UbJKuR/fx2G+monurBrn8xr4DM3QjfB J9PwPg69PDoTvC2WuIzI208I4Cuq0BX4cuqaHZo0RxFlEg4gvhAfZhGLtM1PGvs7cd2t D1K3i4JtSWnNGjlKaE817cfTWsLIdVp8UmD/w1bK1gJVIfbRxHqv9sNsLgUHyFuIUKEQ 00dw== X-Gm-Message-State: APt69E3qvYcak/HjQZ8D+tgF8od7XzCXyHzYC/ztznT63ydiPW/AYAUK QCiDqHl8nvkT2RjMF/54ibiPjg== X-Received: by 2002:adf:ac37:: with SMTP id v52-v6mr10624484wrc.56.1529327238129; Mon, 18 Jun 2018 06:07:18 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p38-v6sm34036243wrc.11.2018.06.18.06.07.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 06:07:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D2F603E072F; Mon, 18 Jun 2018 14:07:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com, cota@braap.org, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 18 Jun 2018 14:07:08 +0100 Message-Id: <20180618130709.19730-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org> References: <20180618130709.19730-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22a Subject: [Qemu-devel] [PATCH v1 7/8] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée --- - fix prints to be "modern" - PEP8 fixes - split inspect into function --- tests/docker/docker.py | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 325915a6f9..c157ff826a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -179,8 +179,14 @@ class Docker(object): stderr=subprocess.STDOUT, **kwargs) + def inspect_tag(self, tag): + try: + return self._output(["inspect", tag]) + except subprocess.CalledProcessError: + return None + def get_image_dockerfile_checksum(self, tag): - resp = self._output(["inspect", tag]) + resp = self.inspect_tag(tag) labels = json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") @@ -442,6 +448,36 @@ class CcCommand(SubCommand): return Docker().command("run", cmd, args.quiet) +class CheckCommand(SubCommand): + """Check if we need to re-build a docker image out of a dockerfile. + Arguments: """ + name = "check" + + def args(self, parser): + parser.add_argument("tag", + help="Image Tag") + parser.add_argument("dockerfile", + help="Dockerfile name") + + def run(self, args, argv): + dockerfile = open(args.dockerfile, "rb").read() + tag = args.tag + + dkr = Docker() + info = 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 = argparse.ArgumentParser(description="A Docker helper", usage="%s ..." % os.path.basename(sys.argv[0]))