Loading tests/docker/docker.py +36 −10 Original line number Diff line number Diff line Loading @@ -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'] Loading Loading @@ -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", {}) Loading Loading @@ -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() Loading @@ -474,6 +481,13 @@ class CheckCommand(SubCommand): print("Image does not exist") 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") Loading @@ -481,6 +495,18 @@ class CheckCommand(SubCommand): 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(): Loading Loading
tests/docker/docker.py +36 −10 Original line number Diff line number Diff line Loading @@ -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'] Loading Loading @@ -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", {}) Loading Loading @@ -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() Loading @@ -474,6 +481,13 @@ class CheckCommand(SubCommand): print("Image does not exist") 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") Loading @@ -481,6 +495,18 @@ class CheckCommand(SubCommand): 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(): Loading