[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 55/57] docker: docker.py adding age check command
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL v2 55/57] docker: docker.py adding age check command |
Date: |
Thu, 21 Jun 2018 07:26:03 +0100 |
This is useful for querying if an image is too old.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index e4f37820e0..b279836154 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -32,6 +32,7 @@ except ImportError:
from io 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']
@@ -190,6 +191,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", {})
@@ -461,11 +465,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()
@@ -474,13 +481,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
- [Qemu-devel] [PULL v2 10/57] tests/tcg: move architecture independent tests into subdir, (continued)
- [Qemu-devel] [PULL v2 10/57] tests/tcg: move architecture independent tests into subdir, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 48/57] tests/tcg: override runners for broken tests, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 12/57] tests/tcg/multiarch: enable additional linux-test tests, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 53/57] docker: docker.py add check sub-command, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 13/57] tests/tcg/multiarch: don't hard code paths/ports for linux-test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 28/57] tests/tcg: move MIPS specific tests into subdir, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 38/57] tests/tcg: enable building for sh4, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 41/57] tests/tcg: enable building for RISCV64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 54/57] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 52/57] docker: docker.py don't conflate checksums for extra_files, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 55/57] docker: docker.py adding age check command,
Alex Bennée <=
- [Qemu-devel] [PULL v2 21/57] tests/tcg/i386/test-i386: use modern vector_size attributes, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 43/57] tests/tcg: enable building for PowerPC, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 57/57] .travis.yml: add check-tcg test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 32/57] tests/tcg: enable building for s390x, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 17/57] tests/tcg/i386: Build fix for hello-i386, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 51/57] docker: docker.py use "version" to probe usage, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 25/57] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 39/57] tests/tcg: enable building for sparc64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 49/57] tests/tcg/i386: extend timeout for runcom test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 56/57] tests/docker/Makefile.include: only force SID to NOCACHE if old, Alex Bennée, 2018/06/21