[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 6/8] docker: docker.py don't conflate checksums f
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 6/8] docker: docker.py don't conflate checksums for extra_files |
Date: |
Mon, 18 Jun 2018 14:07:07 +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 3072bf4a31..325915a6f9 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 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, 2018/06/18
- [Qemu-devel] [PATCH v1 6/8] docker: docker.py don't conflate checksums for extra_files,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 3/8] docker: allow "cc" command to run in user context, Alex Bennée, 2018/06/18