From: "Alex Bennée" <alex.bennee@linaro.org>
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
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v1 8/8] docker: docker.py adding age check command
Date: Mon, 18 Jun 2018 14:07:09 +0100 [thread overview]
Message-ID: <20180618130709.19730-9-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180618130709.19730-1-alex.bennee@linaro.org>
This is useful for querying if an image is too old.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v7
- use cached info
---
tests/docker/docker.py | 46 +++++++++++++++++++++++++++++++++---------
1 file changed, 36 insertions(+), 10 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index c157ff826a..da1ed4e879 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
FILTERED_ENV_NAMES = ['ftp_proxy', 'http_proxy', 'https_proxy']
@@ -185,6 +186,9 @@ class Docker(object):
except subprocess.CalledProcessError:
return None
+ def get_image_creation_time(self, info):
+ return json.loads(info)[0]["Created"]
+
def get_image_dockerfile_checksum(self, tag):
resp = self.inspect_tag(tag)
labels = json.loads(resp)[0]["Config"].get("Labels", {})
@@ -456,11 +460,14 @@ class CheckCommand(SubCommand):
def args(self, parser):
parser.add_argument("tag",
help="Image Tag")
- parser.add_argument("dockerfile",
- help="Dockerfile name")
+ parser.add_argument("dockerfile", default=None,
+ help="Dockerfile name", nargs='?')
+ parser.add_argument("--checktype", choices=["checksum", "age"],
+ default="checksum", help="check type")
+ parser.add_argument("--olderthan", default=60, type=int,
+ help="number of minutes")
def run(self, args, argv):
- dockerfile = open(args.dockerfile, "rb").read()
tag = args.tag
dkr = Docker()
@@ -469,13 +476,32 @@ class CheckCommand(SubCommand):
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
+ if args.checktype == "checksum":
+ if not args.dockerfile:
+ print("Need a dockerfile for tag:%s" % (tag))
+ return 1
+
+ dockerfile = 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 == "age":
+ timestr = dkr.get_image_creation_time(info).split(".")[0]
+ created = datetime.strptime(timestr, "%Y-%m-%dT%H:%M:%S")
+ past = datetime.now() - timedelta(minutes=args.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.olderthan))
+ return 0
def main():
--
2.17.1
next prev parent reply other threads:[~2018-06-18 13:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 13:07 [Qemu-devel] [PATCH v1 0/8] Docker tweaks for TCG testing Alex Bennée
2018-06-18 13:07 ` [Qemu-devel] [PATCH v1 1/8] docker: Add "cc" subcommand Alex Bennée
2018-06-18 13:07 ` [Qemu-devel] [PATCH v1 2/8] docker: extend "cc" command to accept compiler Alex Bennée
2018-06-18 13:07 ` [Qemu-devel] [PATCH v1 3/8] docker: allow "cc" command to run in user context Alex Bennée
2018-06-18 13:07 ` [Qemu-devel] [PATCH v1 4/8] docker: Makefile.include introduce DOCKER_SCRIPT Alex Bennée
2018-06-18 13:07 ` [Qemu-devel] [PATCH v1 5/8] docker: docker.py use "ps" to probe usage Alex Bennée
2018-06-18 15:00 ` Philippe Mathieu-Daudé
2018-06-18 13:07 ` [Qemu-devel] [PATCH v1 6/8] docker: docker.py don't conflate checksums for extra_files Alex Bennée
2018-06-18 16:01 ` Philippe Mathieu-Daudé
2018-06-18 13:07 ` [Qemu-devel] [PATCH v1 7/8] docker: docker.py add check sub-command Alex Bennée
2018-06-18 13:07 ` Alex Bennée [this message]
2018-06-18 16:06 ` [Qemu-devel] [PATCH v1 8/8] docker: docker.py adding age check command Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180618130709.19730-9-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).