[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/22] tests/docker: use explicit docker.io registry
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v4 04/22] tests/docker: use explicit docker.io registry |
Date: |
Wed, 23 Jun 2021 15:22:27 +0100 |
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 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.31.1
- [PATCH v4 00/22] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 01/22] hw/usb/ccid: remove references to NSS, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 02/22] tests/docker: don't use BUILDKIT in GitLab either, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 03/22] tests/docker: use project specific container registries, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 04/22] tests/docker: use explicit docker.io registry,
Daniel P . Berrangé <=
- [PATCH v4 05/22] tests/docker: remove FEATURES env var from templates, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 06/22] tests/docker: fix sorting in package lists, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 07/22] tests/docker: fix mistakes in centos package lists, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 08/22] tests/docker: fix mistakes in fedora package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 09/22] tests/docker: fix mistakes in ubuntu package lists, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 10/22] tests/docker: remove mingw packages from Fedora, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 11/22] tests/docker: expand centos8 package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 12/22] tests/docker: expand fedora package list, Daniel P . Berrangé, 2021/06/23
- [PATCH v4 13/22] tests/docker: expand ubuntu1804 package list, Daniel P . Berrangé, 2021/06/23