Commit f73e4852 authored by Alex Bennée's avatar Alex Bennée
Browse files

docker.py: fix fetching of FROM layers 



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: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200713200415.26214-4-alex.bennee@linaro.org>
parent a77312e7

tests/docker/docker.py

+11 −5
Original line number Diff line number Diff line
@@ -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