Re: [PATCH 04/23] tests/docker: use explicit docker.io registry

From: Wainer dos Santos Moschetta <wainersm@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>, qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>
Subject: Re: [PATCH 04/23] tests/docker: use explicit docker.io registry
Date: Wed, 13 Jan 2021 18:22:07 -0300	[thread overview]
Message-ID: <bd510fbe-b011-0450-3789-fb84cf67f446@redhat.com> (raw)
In-Reply-To: <20201201171825.2243775-5-berrange@redhat.com>


On 12/1/20 2:18 PM, Daniel P. Berrangé wrote:
> It is good practice to use an explicit registry for referencing the base
> image. This is because some distros will inject their own registries
> into the search path. For example registry.fedoraproject.org comes ahead
> of docker.io. Using an explicit registry avoids wasting time querying
> multiple registries for images that they won't have.
Interesting.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +-
>   tests/docker/dockerfiles/debian10.docker            | 2 +-
>   tests/docker/dockerfiles/debian11.docker            | 2 +-
>   tests/docker/dockerfiles/ubuntu.docker              | 2 +-
>   tests/docker/dockerfiles/ubuntu1804.docker          | 2 +-
>   tests/docker/dockerfiles/ubuntu2004.docker          | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
>
> diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> index ba4148299c..2f11b3b7bc 100644
> --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
> +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
> @@ -5,7 +5,7 @@
>   # using a prebuilt toolchains for Xtensa cores from:
>   # https://github.com/foss-xtensa/toolchain/releases
>   #
> -FROM debian:stretch-slim
> +FROM docker.io/library/debian:stretch-slim
>   
>   RUN apt-get update && \
>       DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
> diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
> index 73a3caac9c..6dc0643b29 100644
> --- a/tests/docker/dockerfiles/debian10.docker
> +++ b/tests/docker/dockerfiles/debian10.docker
> @@ -7,7 +7,7 @@
>   # On its own you can't build much but the docker-foo-cross targets
>   # build on top of the base debian image.
>   #
> -FROM debian:buster-slim
> +FROM docker.io/library/debian:buster-slim
>   
>   # Duplicate deb line as deb-src
>   RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
> diff --git a/tests/docker/dockerfiles/debian11.docker b/tests/docker/dockerfiles/debian11.docker
> index 5adfd62d55..febf884f8f 100644
> --- a/tests/docker/dockerfiles/debian11.docker
> +++ b/tests/docker/dockerfiles/debian11.docker
> @@ -8,7 +8,7 @@
>   # On its own you can't build much but the docker-foo-cross targets
>   # build on top of the base debian image.
>   #
> -FROM debian:bullseye-slim
> +FROM docker.io/library/debian:bullseye-slim
>   
>   # Duplicate deb line as deb-src
>   RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index 9dec1c4bc6..ef44b0e360 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -9,7 +9,7 @@
>   # system won't pick up that it has changed.
>   #
>   
> -FROM ubuntu:20.04
> +FROM docker.io/library/ubuntu:20.04
>   ENV PACKAGES \
>       ccache \
>       clang \
> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
> index aacea8627a..751e6503f8 100644
> --- a/tests/docker/dockerfiles/ubuntu1804.docker
> +++ b/tests/docker/dockerfiles/ubuntu1804.docker
> @@ -1,4 +1,4 @@
> -FROM ubuntu:18.04
> +FROM docker.io/library/ubuntu:18.04
>   ENV PACKAGES \
>       ccache \
>       clang \
> diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
> index 52810d4e27..32caf57b5d 100644
> --- a/tests/docker/dockerfiles/ubuntu2004.docker
> +++ b/tests/docker/dockerfiles/ubuntu2004.docker
> @@ -1,4 +1,4 @@
> -FROM ubuntu:20.04
> +FROM docker.io/library/ubuntu:20.04
>   ENV PACKAGES flex bison \
>       ccache \
>       clang-10\