From: Alex Bennée <alex.bennee@linaro.org>
Date: Tue, 25 Jul 2017 13:34:23 +0000 (+0100)
Subject: docker: docker.py make --no-cache skip checksum test
X-Git-Tag: v2.11.0-rc0~87^2~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fe3ae3f194a675a3b73b6beab3ed5dd35db3be3;p=thirdparty%2Fqemu.git

docker: docker.py make --no-cache skip checksum test

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 <alex.bennee@linaro.org>
Message-Id: <20170725133425.436-5-alex.bennee@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 81c87ee3291..08122ca17d0 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: