[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/9] docker.py: fix fetching of FROM layers
From: |
Alex Bennée |
Subject: |
[PULL 4/9] docker.py: fix fetching of FROM layers |
Date: |
Tue, 14 Jul 2020 10:52:42 +0100 |
This worked on a system that was already bootstrapped because the
stage 2 images already existed even if they wouldn't be used. What we
should have pulled down was the FROM line containers first because
building on gitlab doesn't have the advantage of using our build
system to build the pre-requisite bits.
We still pull the image we want to build just in case we can use the
cached data.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200713200415.26214-4-alex.bennee@linaro.org>
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 2d67bbd15a..c9f20d8d09 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -306,14 +306,18 @@ class Docker(object):
checksum = _text_checksum(_dockerfile_preprocess(dockerfile))
if registry is not None:
- # see if we can fetch a cache copy, may fail...
- pull_args = ["pull", "%s/%s" % (registry, tag)]
- if self._do(pull_args, quiet=quiet) == 0:
+ sources = re.findall("FROM qemu\/(.*)", dockerfile)
+ # Fetch any cache layers we can, may fail
+ for s in sources:
+ pull_args = ["pull", "%s/qemu/%s" % (registry, s)]
+ if self._do(pull_args, quiet=quiet) != 0:
+ registry = None
+ break
+ # Make substitutions
+ if registry is not None:
dockerfile = dockerfile.replace("FROM qemu/",
"FROM %s/qemu/" %
(registry))
- else:
- registry = None
tmp_df = tempfile.NamedTemporaryFile(mode="w+t",
encoding='utf-8',
@@ -339,6 +343,8 @@ class Docker(object):
build_args += ["--build-arg", "BUILDKIT_INLINE_CACHE=1"]
if registry is not None:
+ pull_args = ["pull", "%s/%s" % (registry, tag)]
+ self._do(pull_args, quiet=quiet)
cache = "%s/%s" % (registry, tag)
build_args += ["--cache-from", cache]
build_args += argv
--
2.20.1
- [PULL 0/9] final misc fixes for 5.1-rc0, Alex Bennée, 2020/07/14
- [PULL 1/9] docs/devel: fix grammar in multi-thread-tcg, Alex Bennée, 2020/07/14
- [PULL 2/9] configure: remove all dependencies on a (re)configure, Alex Bennée, 2020/07/14
- [PULL 3/9] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image, Alex Bennée, 2020/07/14
- [PULL 4/9] docker.py: fix fetching of FROM layers,
Alex Bennée <=
- [PULL 6/9] fpu/softfloat: fix up float16 nan recognition, Alex Bennée, 2020/07/14
- [PULL 5/9] gitlab-ci/containers: Add missing wildcard where we should look for changes, Alex Bennée, 2020/07/14
- [PULL 7/9] tests/plugins: don't unconditionally add -Wpsabi, Alex Bennée, 2020/07/14
- [PULL 8/9] cputlb: ensure we save the IOTLB data in case of reset, Alex Bennée, 2020/07/14
- [PULL 9/9] plugins: expand the bb plugin to be thread safe and track per-cpu, Alex Bennée, 2020/07/14
- Re: [PULL 0/9] final misc fixes for 5.1-rc0, Peter Maydell, 2020/07/15