From af1622cb04ffdbfd489a1c9ae2a692b9f61a0db9 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Sat, 15 May 2021 14:06:46 +0800 Subject: [PATCH 101/104] CI: use docker.io registry Now we can pull images from docker.io again Signed-off-by: WangFengTu --- CI/test_cases/container_cases/test_data/daemon.json | 2 +- CI/test_cases/image_cases/integration_check.sh | 2 +- CI/test_cases/image_cases/registry.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CI/test_cases/container_cases/test_data/daemon.json b/CI/test_cases/container_cases/test_data/daemon.json index 27b0e7ce..aa88c9da 100644 --- a/CI/test_cases/container_cases/test_data/daemon.json +++ b/CI/test_cases/container_cases/test_data/daemon.json @@ -23,7 +23,7 @@ "overlay2.override_kernel_check=true" ], "registry-mirrors": [ - "https://3laho3y3.mirror.aliyuncs.com" + "docker.io" ], "insecure-registries": [ ], diff --git a/CI/test_cases/image_cases/integration_check.sh b/CI/test_cases/image_cases/integration_check.sh index fe342cc2..7c2af949 100755 --- a/CI/test_cases/image_cases/integration_check.sh +++ b/CI/test_cases/image_cases/integration_check.sh @@ -27,7 +27,7 @@ image="busybox" function test_image_info() { local ret=0 - local uimage="nats" + local uimage="docker.io/library/nats" local test="list && inspect image info test => (${FUNCNAME[@]})" local lid local cid diff --git a/CI/test_cases/image_cases/registry.sh b/CI/test_cases/image_cases/registry.sh index 332af223..36990f30 100755 --- a/CI/test_cases/image_cases/registry.sh +++ b/CI/test_cases/image_cases/registry.sh @@ -77,6 +77,9 @@ function isula_pull() isula pull hub.c.163.com/public/centos:6.7-tools [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - --pull hub.c.163.com/public/centos:6.7-tools failed" && ((ret++)) + isula pull docker.io/library/busybox:latest + [[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - --pull docker.io/library/busybox:latest failed" && ((ret++)) + isula pull 3laho3y3.mirror.aliyuncs.com/library/busybox fn_check_eq "$?" "0" "isula pull 3laho3y3.mirror.aliyuncs.com/library/busybox" -- 2.25.1