[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v5 14/44] tests/docker: use explicit docker.io registry
From: |
Alex Bennée |
Subject: |
[PULL v5 14/44] tests/docker: use explicit docker.io registry |
Date: |
Wed, 14 Jul 2021 16:00:06 +0100 |
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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
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>
Message-Id: <20210709143005.1554-13-alex.bennee@linaro.org>
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
- [PULL v5 03/44] Jobs based on custom runners: docs and gitlab-runner setup playbook, (continued)
- [PULL v5 03/44] Jobs based on custom runners: docs and gitlab-runner setup playbook, Alex Bennée, 2021/07/14
- [PULL v5 05/44] tests/tcg: also disable the signals test for plugins, Alex Bennée, 2021/07/14
- [PULL v5 08/44] build: validate that system capstone works before using it, Alex Bennée, 2021/07/14
- [PULL v5 04/44] Jobs based on custom runners: add job definitions for QEMU's machines, Alex Bennée, 2021/07/14
- [PULL v5 07/44] disable modular TCG on Darwin, Alex Bennée, 2021/07/14
- [PULL v5 02/44] Jobs based on custom runners: build environment docs and playbook, Alex Bennée, 2021/07/14
- [PULL v5 09/44] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run, Alex Bennée, 2021/07/14
- [PULL v5 06/44] meson: fix condition for io_uring stubs, Alex Bennée, 2021/07/14
- [PULL v5 10/44] cirrus: delete FreeBSD and macOS jobs, Alex Bennée, 2021/07/14
- [PULL v5 11/44] hw/usb/ccid: remove references to NSS, Alex Bennée, 2021/07/14
- [PULL v5 14/44] tests/docker: use explicit docker.io registry,
Alex Bennée <=
- [PULL v5 12/44] tests/docker: don't use BUILDKIT in GitLab either, Alex Bennée, 2021/07/14
- [PULL v5 39/44] docs/devel: tcg-plugins: add execlog plugin description, Alex Bennée, 2021/07/14
- [PULL v5 23/44] tests/docker: expand ubuntu1804 package list, Alex Bennée, 2021/07/14
- [PULL v5 36/44] tcg/plugins: enable by default for most TCG builds, Alex Bennée, 2021/07/14
- [PULL v5 44/44] MAINTAINERS: Added myself as a reviewer for TCG Plugins, Alex Bennée, 2021/07/14
- [PULL v5 34/44] configure: add an explicit static and plugins check, Alex Bennée, 2021/07/14
- [PULL v5 26/44] tests/vm: update NetBSD to 9.2, Alex Bennée, 2021/07/14
- [PULL v5 24/44] tests/docker: expand ubuntu2004 package list, Alex Bennée, 2021/07/14
- [PULL v5 40/44] plugins: Added a new cache modelling plugin, Alex Bennée, 2021/07/14
- [PULL v5 22/44] tests/docker: expand fedora package list, Alex Bennée, 2021/07/14