[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/38] docker: docker.py make --no-cache skip checksu
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 02/38] docker: docker.py make --no-cache skip checksum test |
Date: |
Fri, 8 Sep 2017 17:54:30 +0800 |
From: Alex Bennée <address@hidden>
If you invoke with NOCACHE=1 we pass --no-cache in the argv to
docker.py but may still not force a rebuild if the dockerfile checksum
hasn't changed. By testing for its presence we can force builds
without having to manually remove the docker image.
Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
tests/docker/docker.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 81c87ee329..08122ca17d 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -263,7 +263,8 @@ class BuildCommand(SubCommand):
tag = args.tag
dkr = Docker()
- if dkr.image_matches_dockerfile(tag, dockerfile):
+ if "--no-cache" not in argv and \
+ dkr.image_matches_dockerfile(tag, dockerfile):
if not args.quiet:
print "Image is up to date."
else:
--
2.13.5
- [Qemu-devel] [PULL 00/38] Test and build system patches, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 02/38] docker: docker.py make --no-cache skip checksum test,
Fam Zheng <=
- [Qemu-devel] [PULL 03/38] docker: don't install device-tree-compiler build-deps in travis.docker, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 01/38] docker: ensure NOUSER for travis images, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 04/38] docker: reduce noise when building travis.docker, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 05/38] docker: Update ubuntu image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 06/38] docker: Enable features explicitly in test-full, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 08/38] gitignore: Ignore vm test images, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 07/38] tests/docker: Clean up paths, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 09/38] qemu.py: Add "wait()" method, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 10/38] scripts: Add archive-source.sh, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 11/38] tests: Add vm test lib, Fam Zheng, 2017/09/08