From 53fe386da047cce6a9e9f381b2dd73335babe305 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Thu, 8 Oct 2020 09:08:19 -0400 Subject: Cirrus: Use google mirror for docker.io Signed-off-by: Chris Evich --- contrib/cirrus/lib.sh | 1 + contrib/cirrus/setup_environment.sh | 2 ++ 2 files changed, 3 insertions(+) (limited to 'contrib/cirrus') diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index e5124d8e4..8c86925d8 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -208,6 +208,7 @@ install_test_configs() { # 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 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/ } diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 3135a5e65..0f9bf4054 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -178,6 +178,8 @@ case "$TEST_FLAVOR" in remove_packaged_podman_files make install PREFIX=/usr ETCDIR=/etc fi + + install_test_configs ;; vendor) make clean ;; release) ;; -- cgit v1.2.3-54-g00ecf