[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/11] docker.py: fix fetching of FROM layers
From: |
Alex Bennée |
Subject: |
[PATCH v2 03/11] docker.py: fix fetching of FROM layers |
Date: |
Mon, 13 Jul 2020 21:04:07 +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>
---
tests/docker/docker.py | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
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
- [PATCH v2 00/11] misc fixes for rc0 (docker, plugins, softfloat), Alex Bennée, 2020/07/13
- [PATCH v2 04/11] fpu/softfloat: fix up float16 nan recognition, Alex Bennée, 2020/07/13
- [PATCH v2 02/11] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image, Alex Bennée, 2020/07/13
- [PATCH v2 01/11] configure: remove all dependencies on a (re)configure, Alex Bennée, 2020/07/13
- [PATCH v2 03/11] docker.py: fix fetching of FROM layers,
Alex Bennée <=
- [PATCH v2 06/11] cputlb: ensure we save the IOTLB data in case of reset, Alex Bennée, 2020/07/13
- [PATCH v2 05/11] tests/plugins: don't unconditionally add -Wpsabi, Alex Bennée, 2020/07/13
- [PATCH v2 08/11] docs/devel: fix grammar in multi-thread-tcg, Alex Bennée, 2020/07/13
- [PATCH v2 10/11] plugins: add API to return a name for a IO device, Alex Bennée, 2020/07/13