[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 7/8] docker: docker.py add check sub-command
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 7/8] docker: docker.py add check sub-command |
Date: |
Mon, 18 Jun 2018 14:07:08 +0100 |
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 <address@hidden>
---
- fix prints to be "modern"
- PEP8 fixes
- split inspect into function
---
tests/docker/docker.py | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
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: <tag> <dockerfile>"""
+ 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 <subcommand> ..." % os.path.basename(sys.argv[0]))
--
2.17.1
- [Qemu-devel] [PATCH v1 0/8] Docker tweaks for TCG testing, Alex Bennée, 2018/06/18
- [Qemu-devel] [PATCH v1 5/8] docker: docker.py use "ps" to probe usage, Alex Bennée, 2018/06/18
- [Qemu-devel] [PATCH v1 2/8] docker: extend "cc" command to accept compiler, Alex Bennée, 2018/06/18
- [Qemu-devel] [PATCH v1 8/8] docker: docker.py adding age check command, Alex Bennée, 2018/06/18
- [Qemu-devel] [PATCH v1 1/8] docker: Add "cc" subcommand, Alex Bennée, 2018/06/18
- [Qemu-devel] [PATCH v1 4/8] docker: Makefile.include introduce DOCKER_SCRIPT, Alex Bennée, 2018/06/18
- [Qemu-devel] [PATCH v1 7/8] docker: docker.py add check sub-command,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 6/8] docker: docker.py don't conflate checksums for extra_files, Alex Bennée, 2018/06/18
- [Qemu-devel] [PATCH v1 3/8] docker: allow "cc" command to run in user context, Alex Bennée, 2018/06/18