[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 51/56] docker: docker.py don't conflate checksums for
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 51/56] docker: docker.py don't conflate checksums for extra_files |
Date: |
Tue, 19 Jun 2018 16:44:30 +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 e6685f6d81..0a0155c941 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -203,8 +203,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 + \
@@ -319,7 +321,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 16/56] tests/tcg/i386: Build fix for hello-i386, (continued)
- [Qemu-devel] [PULL 16/56] tests/tcg/i386: Build fix for hello-i386, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 10/56] tests/tcg/multiarch: Build fix for linux-test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 13/56] tests/tcg/multiarch: move most output to stdout, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 37/56] tests/tcg: enable building for sh4, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 14/56] tests/tcg: move i386 specific tests into subdir, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 17/56] tests/tcg/i386: fix test-i386, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 22/56] tests/tcg: move ARM specific tests into subdir, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 18/56] tests/tcg/i386: add runner for test-i386-fprem, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 27/56] tests/tcg: move MIPS specific tests into subdir, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 28/56] tests/tcg: enable building for MIPS, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 51/56] docker: docker.py don't conflate checksums for extra_files,
Alex Bennée <=
- [Qemu-devel] [PULL 20/56] tests/tcg/i386/test-i386: use modern vector_size attributes, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 30/56] tests/tcg/mips: include common mips hello-mips, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 36/56] tests/tcg: enable building for m68k, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 47/56] tests/tcg: override runners for broken tests, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 39/56] tests/tcg: enable building for mips64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 55/56] tests/docker/Makefile.include: only force SID to NOCACHE if old, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 48/56] tests/tcg/i386: extend timeout for runcom test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 52/56] docker: docker.py add check sub-command, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 41/56] docker: move debian-powerpc-cross to sid based build, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 43/56] tests/tcg/Makefile: update to be called from Makefile.target, Alex Bennée, 2018/06/19