[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 52/57] docker: docker.py don't conflate checksums
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL v2 52/57] docker: docker.py don't conflate checksums for extra_files |
Date: |
Thu, 21 Jun 2018 07:26: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>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index e6437d64a7..6a9f2f224b 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -206,8 +206,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 + \
@@ -322,7 +324,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] [PULL v2 08/57] docker: allow "cc" command to run in user context, (continued)
- [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, 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 <=
- [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
- [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