Skip to content

Commit

Permalink
tests/docker: use explicit docker.io registry
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
berrange authored and stsquad committed Jul 12, 2021
1 parent 70a53a6 commit 1faab2a
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion 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 \
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/dockerfiles/debian-xtensa-cross.docker
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/dockerfiles/debian10.docker
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/dockerfiles/debian11.docker
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/dockerfiles/ubuntu.docker
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/dockerfiles/ubuntu1804.docker
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM docker.io/library/ubuntu:18.04
ENV PACKAGES \
ccache \
clang \
Expand Down
2 changes: 1 addition & 1 deletion 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 \
Expand Down

0 comments on commit 1faab2a

Please sign in to comment.