From 4ebe58c1f1e0f8ca7cbdb312781e8c8add2e688e Mon Sep 17 00:00:00 2001
From: Aoran Zeng <ccmywish@qq.com>
Date: Fri, 9 Aug 2024 02:10:31 +0800
Subject: [PATCH] Split dockerhub mirrors

---
 include/source.h         | 22 ++--------------------
 src/chsrc.c              | 12 ++++++++++++
 src/recipe/ware/docker.c | 12 ++++++++++++
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/include/source.h b/include/source.h
index 18fc525..d4ea0c3 100644
--- a/include/source.h
+++ b/include/source.h
@@ -99,19 +99,14 @@ MirrorSite
   Volcengine = {"volc",  "Volcengine",   "火山引擎开源软件镜像站", "https://developer.volcengine.com/mirror/",
               "https://mirrors.volces.com/debian" Big_File_debian },
 
-  // 没有找到 DaoCloud 合适的下载链接，先随便给一个，以规避 chsrc 自动测速时所有 dockerhub 镜像站都没有测速链接带来的 bug
-  DaoCloud = {"daocloud", "DaoCloud","上海道客网络科技有限公司", "https://www.daocloud.io/",
-              "https://qiniu-download-public.daocloud.io/DaoCloud_Enterprise/dce5/offline-community-v0.18.0-amd64.tar"},
-
   Netease  = {"netease", "Netease",  "网易开源镜像站",      "https://mirrors.163.com/",
               "https://mirrors.163.com/deepin-cd" Big_File_deepin},
 
   Sohu     = {"sohu",    "SOHU",     "搜狐开源镜像站",      "https://mirrors.sohu.com/",
               "https://mirrors.sohu.com/deepin-cd" Big_File_deepin},
 
-  Api7     = {"api7",    "api7.ai",  "深圳支流科技有限公司", "https://www.apiseven.com/", NULL},
+  Api7     = {"api7",    "api7.ai",  "深圳支流科技有限公司", "https://www.apiseven.com/", NULL};
 
-  Fit2Cloud = {"fit2cloud", "FIT2CLOUD", "杭州飞致云信息科技有限公司", "https://www.fit2cloud.com/", NULL};
 
 // 开源社区
 MirrorSite
@@ -129,11 +124,8 @@ MirrorSite
                "https://goproxy.io/github.com/aws/aws-sdk-go/@v/v1.45.2.zip"},   // 30 MB
 
   NugetOrg   = {"nuget.org",   "NuGet Org",    "Nuget Organization", "https://www.nuget.org/",              NULL},
-  EmacsChina = {"emacschina",  "EmacsChina",   "Emacs China 社区",    "https://elpamirror.emacs-china.org/", NULL},
+  EmacsChina = {"emacschina",  "EmacsChina",   "Emacs China 社区",    "https://elpamirror.emacs-china.org/", NULL};
 
-  Huecker    = {"huecker",     "(Russia) Huecker", "俄罗斯 Huecker.io",   "https://huecker.io/",
-                // 同 DaoCloud，没有合适的下载链接，先随便给一个，以避免 bug
-                "https://huecker.io/en/use.html"};
 
 
 MirrorSite
@@ -143,16 +135,6 @@ MirrorSite
 
 
 
-MirrorSite*
-available_mirrors[] = {
-  &MirrorZ, &Tuna, &Sjtug_Zhiyuan, &Zju, &Lzuoss, &Jlu, &Bfsu, &Pku, &Bjtu, &Sustech, &Ustc, &Hust, &Nju, // &Cqu,
-  &Ali,  &Tencent, &Huawei, &Volcengine,  &Netease, &Sohu, &Api7, &Fit2Cloud,
-  &RubyChina, &EmacsChina, &NpmMirror, &GoProxyCN, &GoProxyIO,
-  // 暂不支持 &NugetOrg
-
-  // 不要列出 &Upstream 和 &UserDdefine
-};
-
 
 typedef struct {
   const MirrorSite *mirror;
diff --git a/src/chsrc.c b/src/chsrc.c
index 8e6aa14..261ca5e 100644
--- a/src/chsrc.c
+++ b/src/chsrc.c
@@ -2334,6 +2334,18 @@ static const char
   wr_winget, wr_brew, wr_cocoapods, wr_dockerhub, wr_flathub, wr_nix, wr_guix, wr_emacs, wr_tex, wr_anaconda
 };
 #undef t
+
+
+
+static MirrorSite*
+available_mirrors[] = {
+  &MirrorZ, &Tuna, &Sjtug_Zhiyuan, &Zju, &Lzuoss, &Jlu, &Bfsu, &Pku, &Bjtu, &Sustech, &Ustc, &Hust, &Nju, // &Cqu,
+  &Ali,  &Tencent, &Huawei, &Volcengine,  &Netease, &Sohu, &Api7, &Fit2Cloud,
+  &RubyChina, &EmacsChina, &NpmMirror, &GoProxyCN, &GoProxyIO,
+  // 暂不支持 &NugetOrg
+  // 不要列出 &Upstream 和 &UserDdefine
+};
+
 /************************************** End Target Matrix ****************************************/
 
 
diff --git a/src/recipe/ware/docker.c b/src/recipe/ware/docker.c
index e2bc9a4..9d55e7b 100644
--- a/src/recipe/ware/docker.c
+++ b/src/recipe/ware/docker.c
@@ -6,6 +6,17 @@
  * Last modified : <2024-08-09>
  * ------------------------------------------------------------*/
 
+static MirrorSite
+// 没有找到 DaoCloud 合适的下载链接，先随便给一个，以规避 chsrc 自动测速时所有 dockerhub 镜像站都没有测速链接带来的 bug
+DaoCloud = {"daocloud", "DaoCloud","上海道客网络科技有限公司", "https://www.daocloud.io/",
+            "https://qiniu-download-public.daocloud.io/DaoCloud_Enterprise/dce5/offline-community-v0.18.0-amd64.tar"},
+
+Fit2Cloud = {"fit2cloud", "FIT2CLOUD", "杭州飞致云信息科技有限公司", "https://www.fit2cloud.com/", NULL},
+
+Huecker = {"huecker",  "(Russia) Huecker", "俄罗斯 Huecker.io",   "https://huecker.io/",
+           // 同 DaoCloud，没有合适的下载链接，先随便给一个，以避免 bug
+           "https://huecker.io/en/use.html"};
+
 /**
  * 2024-07-24 更新
  *
@@ -31,6 +42,7 @@ wr_dockerhub_sources[] = {
 
 def_sources_n(wr_dockerhub);
 
+
 void
 wr_dockerhub_getsrc (char *option)
 {