[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 49/54] docker: docker.py don't conflate checksums
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v7 49/54] docker: docker.py don't conflate checksums for extra_files |
Date: |
Fri, 15 Jun 2018 20:47:00 +0100 |
This just gets confusing especially as the helper function doesn't
even take into account any extra files (or the executable). Currently
the actual check just ignores them and also passes the result through
_dockerfile_preprocess so we fix that too.
Signed-off-by: Alex Bennée <address@hidden>
---
tests/docker/docker.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index c83fd89985..2593a12d04 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -201,8 +201,10 @@ class Docker(object):
tmp_df.write("\n")
tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" %
- _text_checksum("\n".join([dockerfile] +
- extra_files_cksum)))
+ _text_checksum(_dockerfile_preprocess(dockerfile)))
+ for f, c in extra_files_cksum:
+ tmp_df.write("LABEL com.qemu.%s-checksum=%s" % (f, c))
+
tmp_df.flush()
self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + \
@@ -317,7 +319,7 @@ class BuildCommand(SubCommand):
_copy_binary_with_libs(args.include_executable, docker_dir)
for filename in args.extra_files or []:
_copy_with_mkdir(filename, docker_dir)
- cksum += [_file_checksum(filename)]
+ cksum += [(filename, _file_checksum(filename))]
argv += ["--build-arg=" + k.lower() + "=" + v
for k, v in os.environ.iteritems()
--
2.17.1
- [Qemu-devel] [PATCH v7 54/54] .travis.yml: add check-tcg test, (continued)
- [Qemu-devel] [PATCH v7 54/54] .travis.yml: add check-tcg test, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 31/54] tests/tcg: enable building for s390x, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 37/54] tests/tcg: enable building for sh4, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 53/54] tests/docker/Makefile.include: only force SID to NOCACHE if old, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 42/54] tests/tcg: enable building for PowerPC, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 48/54] tests: add top-level make dependency for docker builds, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 20/54] tests/tcg/i386/test-i386: use modern vector_size attributes, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 47/54] tests/tcg: override runners for broken tests, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 41/54] docker: move debian-powerpc-cross to sid based build, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 25/54] tests/tcg: enable building for AArch64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 49/54] docker: docker.py don't conflate checksums for extra_files,
Alex Bennée <=
- [Qemu-devel] [PATCH v7 40/54] tests/tcg: enable building for RISCV64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 18/54] tests/tcg/i386: add runner for test-i386-fprem, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 30/54] tests/tcg/mips: include common mips hello-mips, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 33/54] tests/tcg: enable building for Alpha, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 28/54] tests/tcg: enable building for MIPS, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 45/54] tests/Makefile.include: add [build|clean|check]-tcg targets, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 26/54] tests/tcg/arm: add fcvt test cases for AArch32/64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 16/54] tests/tcg/i386: Build fix for hello-i386, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 17/54] tests/tcg/i386: fix test-i386, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 39/54] tests/tcg: enable building for mips64, Alex Bennée, 2018/06/15