[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 53/57] docker: docker.py add check sub-command
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL v2 53/57] docker: docker.py add check sub-command |
Date: |
Thu, 21 Jun 2018 07:26:01 +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>
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 6a9f2f224b..e4f37820e0 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -184,8 +184,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", "")
@@ -447,6 +453,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] [PULL v2 01/57] docker: docker.py wrap StringIO import for python3, (continued)
- [Qemu-devel] [PULL v2 01/57] docker: docker.py wrap StringIO import for python3, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 06/57] docker: Add "cc" subcommand, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 05/57] configure: set cross_cc_FOO for host compiler, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 02/57] configure: add support for --cross-cc-FOO, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 07/57] docker: extend "cc" command to accept compiler, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 09/57] docker: Makefile.include introduce DOCKER_SCRIPT, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 08/57] docker: allow "cc" command to run in user context, Alex Bennée, 2018/06/21
- [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 <=
- [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, 2018/06/21
- [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