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

delete docker mirror registry by 'azure.cn'

pull/833/head
gjmzj 2020-04-19 19:10:18 +08:00
parent c2c0752ebe
commit 7a8860ff0c
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/containerd/templates/config.toml.j2
View File

@ -55,23 +55,19 @@ oom_score = 0
# reference from https://www.ilanni.com/?p=14534 # reference from https://www.ilanni.com/?p=14534
[plugins.cri.registry.mirrors."docker.io"] [plugins.cri.registry.mirrors."docker.io"]
endpoint = [ endpoint = [
"https://dockerhub.azk8s.cn",
"https://docker.mirrors.ustc.edu.cn", "https://docker.mirrors.ustc.edu.cn",
"http://hub-mirror.c.163.com" "http://hub-mirror.c.163.com"
] ]
[plugins.cri.registry.mirrors."gcr.io"] [plugins.cri.registry.mirrors."gcr.io"]
endpoint = [ endpoint = [
"https://gcr.azk8s.cn",
"https://gcr.mirrors.ustc.edu.cn" "https://gcr.mirrors.ustc.edu.cn"
] ]
[plugins.cri.registry.mirrors."k8s.gcr.io"] [plugins.cri.registry.mirrors."k8s.gcr.io"]
endpoint = [ endpoint = [
"https://gcr.azk8s.cn/google-containers/",
"https://gcr.mirrors.ustc.edu.cn/google-containers/" "https://gcr.mirrors.ustc.edu.cn/google-containers/"
] ]
[plugins.cri.registry.mirrors."quay.io"] [plugins.cri.registry.mirrors."quay.io"]
endpoint = [ endpoint = [
"https://quay.azk8s.cn",
"https://quay.mirrors.ustc.edu.cn" "https://quay.mirrors.ustc.edu.cn"
] ]
{% endif %} {% endif %}

2
roles/docker/defaults/main.yml
View File

@ -15,7 +15,7 @@ ENABLE_REMOTE_API: false
ENABLE_MIRROR_REGISTRY: true ENABLE_MIRROR_REGISTRY: true
# 设置 docker 仓库镜像 # 设置 docker 仓库镜像
REG_MIRRORS: '["https://dockerhub.azk8s.cn", "https://docker.mirrors.ustc.edu.cn"]' REG_MIRRORS: '["https://docker.mirrors.ustc.edu.cn", "http://hub-mirror.c.163.com"]'
# 信任的HTTP仓库 # 信任的HTTP仓库
INSECURE_REG: '["127.0.0.1/8"]' INSECURE_REG: '["127.0.0.1/8"]'

1
tools/easzup
View File

@ -78,7 +78,6 @@ EOF
cat > /etc/docker/daemon.json << EOF cat > /etc/docker/daemon.json << EOF
{ {
"registry-mirrors": [ "registry-mirrors": [
"https://dockerhub.azk8s.cn",
"https://docker.mirrors.ustc.edu.cn", "https://docker.mirrors.ustc.edu.cn",
"http://hub-mirror.c.163.com" "http://hub-mirror.c.163.com"
], ],

14
tools/imgutils
View File

@ -88,8 +88,7 @@ function pull_any_image() {
F=$(echo "$1"|awk -F/ '{print NF}') F=$(echo "$1"|awk -F/ '{print NF}')
case "$F" in case "$F" in
1) 1)
HUB="dockerhub.azk8s.cn" HUB="docker.mirrors.ustc.edu.cn"
#HUB="docker.mirrors.ustc.edu.cn"
GRP="library" GRP="library"
IMG="$1" IMG="$1"
;; ;;
@ -97,12 +96,11 @@ function pull_any_image() {
F1=$(echo "$1"|awk -F/ '{print $1}') F1=$(echo "$1"|awk -F/ '{print $1}')
F2=$(echo "$1"|awk -F/ '{print $2}') F2=$(echo "$1"|awk -F/ '{print $2}')
if [[ "$F1" == k8s.gcr.io ]];then if [[ "$F1" == k8s.gcr.io ]];then
HUB="gcr.azk8s.cn" HUB="gcr.mirrors.ustc.edu.cn"
#HUB="gcr.mirrors.ustc.edu.cn"
GRP="google-containers" GRP="google-containers"
IMG="$F2" IMG="$F2"
else else
HUB="dockerhub.azk8s.cn" HUB="docker.mirrors.ustc.edu.cn"
GRP="$F1" GRP="$F1"
IMG="$F2" IMG="$F2"
fi fi
@ -112,11 +110,9 @@ function pull_any_image() {
F2=$(echo "$1"|awk -F/ '{print $2}') F2=$(echo "$1"|awk -F/ '{print $2}')
F3=$(echo "$1"|awk -F/ '{print $3}') F3=$(echo "$1"|awk -F/ '{print $3}')
if [[ "$F1" == quay.io ]];then if [[ "$F1" == quay.io ]];then
HUB="quay.azk8s.cn" HUB="quay.mirrors.ustc.edu.cn"
#HUB="quay.mirrors.ustc.edu.cn"
elif [[ "$F1" == gcr.io ]];then elif [[ "$F1" == gcr.io ]];then
HUB="gcr.azk8s.cn" HUB="gcr.mirrors.ustc.edu.cn"
#HUB="gcr.mirrors.ustc.edu.cn"
else else
logger warn "no mirror image for $1" logger warn "no mirror image for $1"
HUB="$F1" HUB="$F1"