Re: [PATCH 03/23] tests/docker: use project specific container registries

[Wainer dos Santos Moschetta]

Hi,

On 12/1/20 2:18 PM, Daniel P. Berrangé wrote:
> Since Docker Hub has started to enforce pull rate limits on clients, it
> is preferrable to use project specific container registries where they
> are available. Both Fedora and CentOS provide such registries.
>
> The images in these registries are also refreshed on a more regular
> basis than the ones in docker hub, so the package update should
> generally be faster.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   tests/docker/dockerfiles/centos7.docker            | 2 +-
>   tests/docker/dockerfiles/centos8.docker            | 2 +-
>   tests/docker/dockerfiles/fedora-cris-cross.docker  | 2 +-
>   tests/docker/dockerfiles/fedora-i386-cross.docker  | 2 +-
>   tests/docker/dockerfiles/fedora-win32-cross.docker | 2 +-
>   tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +-
>   tests/docker/dockerfiles/fedora.docker             | 2 +-
>   7 files changed, 7 insertions(+), 7 deletions(-)

I didn't find in Fedora's containers documents [1] if they have a policy 
on how long to retain old images (e.g. versions which reached EOL), and 
I didn't check CentOS's. Other than that,

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

[1] https://docs.fedoraproject.org/en-US/containers/

> diff --git a/tests/docker/dockerfiles/centos7.docker 
> b/tests/docker/dockerfiles/centos7.docker
> index d47c96135c..35445becb8 100644
> --- a/tests/docker/dockerfiles/centos7.docker
> +++ b/tests/docker/dockerfiles/centos7.docker
> @@ -1,4 +1,4 @@
> -FROM centos:7
> +FROM registry.centos.org/centos:7
>   RUN yum install -y epel-release centos-release-xen-48
>   
>   RUN yum -y update
> diff --git a/tests/docker/dockerfiles/centos8.docker 
> b/tests/docker/dockerfiles/centos8.docker
> index bbd82421db..9560bb06e2 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -1,4 +1,4 @@
> -FROM centos:8.1.1911
> +FROM registry.centos.org/centos:8
>   
>   RUN dnf -y update
>   ENV PACKAGES \
> diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker 
> b/tests/docker/dockerfiles/fedora-cris-cross.docker
> index 09e7e449f9..b7f02d18d3 100644
> --- a/tests/docker/dockerfiles/fedora-cris-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker
> @@ -2,7 +2,7 @@
>   # Cross compiler for cris system tests
>   #
>   
> -FROM fedora:30
> +FROM registry.fedoraproject.org/fedora:30
>   ENV PACKAGES gcc-cris-linux-gnu
>   RUN dnf install -y $PACKAGES
>   RUN rpm -q $PACKAGES | sort > /packages.txt
> diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker 
> b/tests/docker/dockerfiles/fedora-i386-cross.docker
> index cd16cd1bfa..d10586c79e 100644
> --- a/tests/docker/dockerfiles/fedora-i386-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
> @@ -1,4 +1,4 @@
> -FROM fedora:30
> +FROM registry.fedoraproject.org/fedora:30
>   ENV PACKAGES \
>       gcc \
>       glib2-devel.i686 \
> diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker 
> b/tests/docker/dockerfiles/fedora-win32-cross.docker
> index 087df598a0..8dc4f0d4c9 100644
> --- a/tests/docker/dockerfiles/fedora-win32-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
> @@ -1,4 +1,4 @@
> -FROM fedora:32
> +FROM registry.fedoraproject.org/fedora:32
>   
>   # Please keep this list sorted alphabetically
>   ENV PACKAGES \
> diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker 
> b/tests/docker/dockerfiles/fedora-win64-cross.docker
> index d5d2f5f00d..c530e6ba36 100644
> --- a/tests/docker/dockerfiles/fedora-win64-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
> @@ -1,4 +1,4 @@
> -FROM fedora:32
> +FROM registry.fedoraproject.org/fedora:32
>   
>   # Please keep this list sorted alphabetically
>   ENV PACKAGES \
> diff --git a/tests/docker/dockerfiles/fedora.docker 
> b/tests/docker/dockerfiles/fedora.docker
> index 19e7a3d28a..0bc66f7293 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -1,4 +1,4 @@
> -FROM fedora:32
> +FROM registry.fedoraproject.org/fedora:32
>   
>   # Please keep this list sorted alphabetically
>   ENV PACKAGES \