summaryrefslogtreecommitdiffstats
path: root/tests/docker
diff options
context:
space:
mode:
Diffstat (limited to 'tests/docker')
-rwxr-xr-xtests/docker/docker.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 9684f07bde..2d67bbd15a 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -306,13 +306,14 @@ class Docker(object):
checksum = _text_checksum(_dockerfile_preprocess(dockerfile))
if registry is not None:
- dockerfile = dockerfile.replace("FROM qemu/",
- "FROM %s/qemu/" %
- (registry))
# see if we can fetch a cache copy, may fail...
pull_args = ["pull", "%s/%s" % (registry, tag)]
- self._do(pull_args, quiet=quiet)
-
+ if self._do(pull_args, quiet=quiet) == 0:
+ dockerfile = dockerfile.replace("FROM qemu/",
+ "FROM %s/qemu/" %
+ (registry))
+ else:
+ registry = None
tmp_df = tempfile.NamedTemporaryFile(mode="w+t",
encoding='utf-8',