From nobody Tue Feb 10 20:48:44 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 152909597995389.24336604125699; Fri, 15 Jun 2018 13:52:59 -0700 (PDT) Received: from localhost ([::1]:49362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTviH-0001by-UA for importer@patchew.org; Fri, 15 Jun 2018 16:52:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvHU-0007O1-F3 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:25:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTvHT-0000Sg-Fs for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:25:12 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:41460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTvHT-0000Qc-8C for qemu-devel@nongnu.org; Fri, 15 Jun 2018 16:25:11 -0400 Received: by mail-wr0-x22b.google.com with SMTP id h10-v6so11027808wrq.8 for ; Fri, 15 Jun 2018 13:25:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l41-v6sm14496439wre.87.2018.06.15.13.25.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 13:25:09 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EDED03E106A; Fri, 15 Jun 2018 20:47:09 +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=KUdahVU/i9mq1HTJDs12v2i8V4OOTOL0M/sH1KVg8nE=; b=O1UciY8bHHYCtN+SMRe0r+hqjq/xBXM8qaIHs6WNaEhsF1pJdHbe6ZrvxsXFuZCU6u nG9HwQLU1MzEOfUSmDHxUcUBvhlmCWCkJa1tJe1ipCM/RW/c7CvNozR0+khI64JXhRkg ueYp9L0ZQJaL7FQvWM7fyY6jmOPE+fz1ilZ6w= 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=KUdahVU/i9mq1HTJDs12v2i8V4OOTOL0M/sH1KVg8nE=; b=Pc8TE9Th7swynLBg8sSLlIZ9sr16EvPuwn3DJ1EvsJM4tKYhHVumtKeA5VKds3HZUS IT6X8eLmP5BbB6di9IClZkVysjKy+888T02RktivItadlS1yns/yJH7M4UrnTFi7skrw UttYFknEsBG3JzuI6iNtBgc25ZFDkt7zx2NUIT3GNBb+cVRTDjksAxGrcNX/AyqkHG30 HOaog4kntsYjLEejKsVq2S6oifYobe0twuf2yOILKIYZH8Hzs6Wa64MoabYKYNb6+jJN E7ZyEkJraKasepNsgN2yXFxFk4I4LzgVTY7tSQvanRSZug62WIVW2EhDB7EIKuq38S4J kdQA== X-Gm-Message-State: APt69E2aDBRnbQceLofGxAdgitmw4V4RHXv3v6rMLgnfqGpumy9HU4c0 HVi/1gO/diGe/wc+QVnXvpLGug== X-Google-Smtp-Source: ADUXVKKaib4DIYvpNC3R+dpAaCB56rY/NN6l9CFqgED8z1X73f+37sKYLts+wBoBKuYa7n88u6X+/g== X-Received: by 2002:a5d:4049:: with SMTP id w9-v6mr2904040wrp.96.1529094310153; Fri, 15 Jun 2018 13:25:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:47:03 +0100 Message-Id: <20180615194705.28019-53-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-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::22b Subject: [Qemu-devel] [PATCH v7 52/54] docker: docker.py adding age check 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org 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 is useful for querying if an image is too old. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/docker.py | 49 ++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 3666197a16..ad0c47921a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -29,6 +29,7 @@ from tarfile import TarFile, TarInfo from StringIO import StringIO from shutil import copy, rmtree from pwd import getpwuid +from datetime import datetime,timedelta =20 =20 FILTERED_ENV_NAMES =3D ['ftp_proxy', 'http_proxy', 'https_proxy'] @@ -184,6 +185,10 @@ class Docker(object): labels =3D json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") =20 + def get_image_creation_time(self, tag): + resp =3D self._output(["inspect", tag]) + return json.loads(resp)[0]["Created"] + def build_image(self, tag, docker_dir, dockerfile, quiet=3DTrue, user=3DFalse, argv=3DNone, extra_files_c= ksum=3D[]): if argv =3D=3D None: @@ -450,21 +455,43 @@ class CheckCommand(SubCommand): def args(self, parser): parser.add_argument("tag", help=3D"Image Tag") - parser.add_argument("dockerfile", - help=3D"Dockerfile name") + parser.add_argument("dockerfile", default=3DNone, + help=3D"Dockerfile name", nargs=3D'?') + parser.add_argument("--checktype", choices=3D["checksum", "age"], + default=3D"checksum", help=3D"check type") + parser.add_argument("--olderthan", default=3D60, type=3Dint, + help=3D"number of minutes") =20 def run(self, args, argv): - dockerfile =3D open(args.dockerfile, "rb").read() tag =3D args.tag - dkr =3D Docker() - 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 + + if args.checktype =3D=3D "checksum": + if not args.dockerfile: + print("Need a dockerfile for tag:%s" % (tag)) + return 1 + + dockerfile =3D open(args.dockerfile, "rb").read() + + 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 + elif args.checktype =3D=3D "age": + timestr =3D dkr.get_image_creation_time(tag).split(".")[0] + created =3D datetime.strptime(timestr, "%Y-%m-%dT%H:%M:%S") + past =3D datetime.now() - timedelta(minutes=3Dargs.olderthan) + if created < past: + print ("Image created @ %s more than %d minutes old" % + (timestr, args.olderthan)) + return 1 + else: + if not args.quiet: + print ("Image less than %d minutes old" % (args.oldert= han)) + return 0 =20 =20 def main(): --=20 2.17.1