From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Thomas Huth" <thuth@redhat.com>,
minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com,
"Alex Bennée" <alex.bennee@linaro.org>,
f4bug@amsat.org, robhenry@microsoft.com,
"Willian Rampazzo" <willianr@redhat.com>,
mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com,
cota@braap.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com,
ma.mandourr@gmail.com,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
aurelien@aurel32.net
Subject: [PATCH v3 12/40] tests/docker: use explicit docker.io registry
Date: Fri, 9 Jul 2021 15:29:37 +0100 [thread overview]
Message-ID: <20210709143005.1554-13-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210709143005.1554-1-alex.bennee@linaro.org>
From: Daniel P. Berrangé <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.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210623142245.307776-5-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
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 03e0440e03..8f810810f3 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 4ffe47671e..a27b88df55 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 100cfa76e3..e0ff425c01 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 86114be23a..adcdef8244 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 b33ed139d9..78755bc2e3 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.20.1
next prev parent reply other threads:[~2021-07-09 14:37 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-09 14:29 [PATCH for 6.1 v3 00/40] testing and plugins pre-PR Alex Bennée
2021-07-09 14:29 ` [PATCH v3 01/40] Jobs based on custom runners: documentation and configuration placeholder Alex Bennée
2021-07-09 14:29 ` [PATCH v3 02/40] Jobs based on custom runners: build environment docs and playbook Alex Bennée
2021-07-09 14:29 ` [PATCH v3 03/40] Jobs based on custom runners: docs and gitlab-runner setup playbook Alex Bennée
2021-07-09 14:29 ` [PATCH v3 04/40] Jobs based on custom runners: add job definitions for QEMU's machines Alex Bennée
2021-07-09 14:29 ` [PATCH v3 05/40] tests/tcg: also disable the signals test for plugins Alex Bennée
2021-07-09 14:29 ` [PATCH v3 06/40] build: validate that system capstone works before using it Alex Bennée
2021-07-09 14:29 ` [PATCH v3 07/40] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Alex Bennée
2021-07-09 14:29 ` [PATCH v3 08/40] cirrus: delete FreeBSD and macOS jobs Alex Bennée
2021-07-09 14:29 ` [PATCH v3 09/40] hw/usb/ccid: remove references to NSS Alex Bennée
2021-07-09 14:29 ` [PATCH v3 10/40] tests/docker: don't use BUILDKIT in GitLab either Alex Bennée
2021-07-09 14:29 ` [PATCH v3 11/40] tests/docker: use project specific container registries Alex Bennée
2021-07-09 14:29 ` Alex Bennée [this message]
2021-07-09 14:29 ` [PATCH v3 13/40] tests/docker: remove FEATURES env var from templates Alex Bennée
2021-07-09 14:29 ` [PATCH v3 14/40] tests/docker: fix sorting in package lists Alex Bennée
2021-07-09 14:29 ` [PATCH v3 15/40] tests/docker: fix mistakes in centos " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 16/40] tests/docker: fix mistakes in fedora package list Alex Bennée
2021-07-09 14:29 ` [PATCH v3 17/40] tests/docker: fix mistakes in ubuntu package lists Alex Bennée
2021-07-09 14:29 ` [PATCH v3 18/40] tests/docker: remove mingw packages from Fedora Alex Bennée
2021-07-09 14:29 ` [PATCH v3 19/40] tests/docker: expand centos8 package list Alex Bennée
2021-07-09 14:29 ` [PATCH v3 20/40] tests/docker: expand fedora " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 21/40] tests/docker: expand ubuntu1804 " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 22/40] tests/docker: expand ubuntu2004 " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 23/40] tests/docker: expand opensuse-leap " Alex Bennée
2021-07-09 14:29 ` [PATCH v3 24/40] tests/vm: update NetBSD to 9.2 Alex Bennée
2021-07-09 14:29 ` [PATCH v3 25/40] tests/vm: update openbsd to release 6.9 Alex Bennée
2021-07-09 14:29 ` [PATCH v3 26/40] tests/tcg: make test-mmap a little less aggressive Alex Bennée
2021-07-09 15:04 ` Richard Henderson
2021-07-11 23:59 ` Taylor Simpson
2021-07-09 14:29 ` [PATCH v3 27/40] plugins: fix-up handling of internal hostaddr for 32 bit Alex Bennée
2021-07-09 14:29 ` [PATCH v3 28/40] meson.build: move TCG plugin summary output Alex Bennée
2021-07-09 14:29 ` [PATCH v3 29/40] configure: don't allow plugins to be enabled for a non-TCG build Alex Bennée
2021-07-09 14:29 ` [PATCH v3 30/40] configure: add an explicit static and plugins check Alex Bennée
2021-07-09 15:06 ` Richard Henderson
2021-07-09 14:29 ` [PATCH v3 31/40] configure: stop user enabling plugins on Windows for now Alex Bennée
2021-07-09 14:29 ` [PATCH v3 32/40] tcg/plugins: enable by default for most TCG builds Alex Bennée
2021-07-09 15:12 ` Richard Henderson
2021-07-09 14:29 ` [PATCH v3 33/40] contrib/plugins: enable -Wall for building plugins Alex Bennée
2021-07-09 14:29 ` [PATCH v3 34/40] contrib/plugins: add execlog to log instruction execution and memory access Alex Bennée
2021-07-09 14:30 ` [PATCH v3 35/40] docs/devel: tcg-plugins: add execlog plugin description Alex Bennée
2021-07-09 14:30 ` [PATCH v3 36/40] plugins: Added a new cache modelling plugin Alex Bennée
2021-07-09 14:30 ` [PATCH v3 37/40] plugins/cache: Enable cache parameterization Alex Bennée
2021-07-09 14:30 ` [PATCH v3 38/40] plugins/cache: Added FIFO and LRU eviction policies Alex Bennée
2021-07-09 14:30 ` [PATCH v3 39/40] docs/devel: Added cache plugin to the plugins docs Alex Bennée
2021-07-09 14:30 ` [PATCH v3 40/40] MAINTAINERS: Added myself as a reviewer for TCG Plugins Alex Bennée
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=20210709143005.1554-13-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aaron@os.amperecomputing.com \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=crosa@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=kuhn.chenqun@huawei.com \
--cc=ma.mandourr@gmail.com \
--cc=mahmoudabdalghany@outlook.com \
--cc=minyihh@uci.edu \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=robhenry@microsoft.com \
--cc=stefanha@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).