From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v3 04/22] tests/docker: use explicit docker.io registry
Date: Thu, 13 May 2021 10:55:01 +0100 [thread overview]
Message-ID: <20210513095519.1213675-5-berrange@redhat.com> (raw)
In-Reply-To: <20210513095519.1213675-1-berrange@redhat.com>
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.
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/docker/dockerfiles/centos8.docker | 2 +-
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 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 92c0ed34b8..4f77c754e2 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -1,4 +1,4 @@
-FROM centos:8.3.2011
+FROM docker.io/centos:8
RUN dnf -y update
ENV PACKAGES \
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 d034acbd25..ad9c128370 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 7f32990bcd..0e761f4553 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 \
bsdmainutils \
ccache \
--
2.31.1
next prev parent reply other threads:[~2021-05-13 9:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 9:54 [PATCH v3 00/22] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2021-05-13 9:54 ` [PATCH v3 01/22] hw/usb/ccid: remove references to NSS Daniel P. Berrangé
2021-05-13 9:54 ` [PATCH v3 02/22] tests/docker: don't use BUILDKIT in GitLab either Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 03/22] tests/docker: use project specific container registries Daniel P. Berrangé
2021-05-13 9:55 ` Daniel P. Berrangé [this message]
2021-05-13 9:55 ` [PATCH v3 05/22] tests/docker: remove FEATURES env var from templates Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 06/22] tests/docker: fix sorting in package lists Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 07/22] tests/docker: fix mistakes in centos " Daniel P. Berrangé
2021-05-13 10:14 ` Philippe Mathieu-Daudé
2021-05-13 9:55 ` [PATCH v3 08/22] tests/docker: fix mistakes in fedora package list Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 09/22] tests/docker: fix mistakes in ubuntu package lists Daniel P. Berrangé
2021-05-13 10:12 ` Philippe Mathieu-Daudé
2021-05-13 10:15 ` Daniel P. Berrangé
2021-05-13 10:19 ` Philippe Mathieu-Daudé
2021-05-13 9:55 ` [PATCH v3 10/22] tests/docker: remove mingw packages from Fedora Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 11/22] tests/docker: expand centos8 package list Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 12/22] tests/docker: expand fedora " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 13/22] tests/docker: expand ubuntu1804 " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 14/22] tests/docker: expand ubuntu2004 " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 15/22] tests/docker: expand opensuse-leap " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 16/22] tests/docker: add script for automating container refresh Daniel P. Berrangé
2021-05-13 10:18 ` Philippe Mathieu-Daudé
2021-05-13 9:55 ` [PATCH v3 17/22] tests/docker: auto-generate centos8 with lcitool Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 18/22] tests/docker: auto-generate fedora " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 19/22] tests/docker: auto-generate ubuntu1804 " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 20/22] tests/docker: auto-generate ubuntu2004 " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 21/22] tests/docker: auto-generate opensuse-leap " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 22/22] tests/docker: remove ubuntu container Daniel P. Berrangé
2021-05-13 10:39 ` [PATCH v3 00/22] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210513095519.1213675-5-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.