containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Use google mirror for docker.io 

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2020-10-08 09:08:19 -04:00 committed by Ed Santiago
parent 5d48606dae
commit 53fe386da0
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/cirrus/lib.sh
View File

@ -208,6 +208,7 @@ install_test_configs() {
# as the default). This config prevents allocation of network address space used # as the default). This config prevents allocation of network address space used
# by default in google cloud. https://cloud.google.com/vpc/docs/vpc#ip-ranges # by default in google cloud. https://cloud.google.com/vpc/docs/vpc#ip-ranges
install -v -D -m 644 $SCRIPT_BASE/99-do-not-use-google-subnets.conflist /etc/cni/net.d/ install -v -D -m 644 $SCRIPT_BASE/99-do-not-use-google-subnets.conflist /etc/cni/net.d/
install -v -D -m 644 ./test/registries.conf /etc/containers/ install -v -D -m 644 ./test/registries.conf /etc/containers/
} }

2
contrib/cirrus/setup_environment.sh
View File

@ -178,6 +178,8 @@ case "$TEST_FLAVOR" in
remove_packaged_podman_files remove_packaged_podman_files
make install PREFIX=/usr ETCDIR=/etc make install PREFIX=/usr ETCDIR=/etc
fi fi
install_test_configs
;; ;;
vendor) make clean ;; vendor) make clean ;;
release) ;; release) ;;

21
test/registries.conf
View File

@ -1,10 +1,17 @@
# Note that changing the order here may break tests. # Note that changing the order here may break tests.
[registries.search] unqualified-search-registries = ['docker.io', 'quay.io', 'registry.fedoraproject.org']
registries = ['docker.io', 'quay.io', 'registry.fedoraproject.org']
[registries.insecure] [[registry]]
registries = [] # In Nov. 2020, Docker rate-limits image pulling. To avoid hitting these
# limits while testing, always use the google mirror for qualified and
# unqualified `docker.io` images.
# Ref: https://cloud.google.com/container-registry/docs/pulling-cached-images
prefix="docker.io"
location="mirror.gcr.io"
#blocked (docker only) # 2020-10-27 a number of images are not present in gcr.io, and podman
[registries.block] # barfs spectacularly when trying to fetch them. We've hand-copied
registries = [] # those to quay, using skopeo copy --all ...
[[registry]]
prefix="docker.io/library"
location="quay.io/libpod"