[PULL,v2,02/37] docker: docker.py make --no-cache skip checksum test

Message ID 20170909054613.19148-3-famz@redhat.com
State Superseded
Headers show
  • [PULL,v2,01/37] docker: ensure NOUSER for travis images
Related show

Commit Message

Fam Zheng Sept. 9, 2017, 5:45 a.m.
From: Alex Bennée <alex.bennee@linaro.org>

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>

 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."