lug: migrate docker-ce back to rsync-gateway (#499)

sjtug · Jan 9, 2025 · cd61d4e · cd61d4e
1 parent 1e20bc4
commit cd61d4e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/caddy/Caddyfile.siyuan b/caddy/Caddyfile.siyuan
@@ -45,8 +45,8 @@ http://mirror.sjtu.edu.cn {
         redir * {scheme}://ftp.sjtu.edu.cn/deepin{uri} 302
     }
     redir /docker-ce /docker-ce/ 301
-    handle_path /docker-ce/* {
-        redir * {scheme}://ftp.sjtu.edu.cn/docker-ce{uri} 302
+    handle /docker-ce/* {
+        reverse_proxy rsync-gateway:8000
     }
     redir /fedora/linux /fedora/linux/ 301
     handle_path /fedora/linux/* {
@@ -429,8 +429,8 @@ https://mirror.sjtu.edu.cn {
         redir * {scheme}://ftp.sjtu.edu.cn/deepin-cd{uri} 302
     }
     redir /docker-ce /docker-ce/ 301
-    handle_path /docker-ce/* {
-        redir * {scheme}://ftp.sjtu.edu.cn/docker-ce{uri} 302
+    handle /docker-ce/* {
+        reverse_proxy rsync-gateway:8000
     }
     redir /fedora/linux /fedora/linux/ 301
     handle_path /fedora/linux/* {

diff --git a/caddy/Caddyfile.zhiyuan b/caddy/Caddyfile.zhiyuan
@@ -669,7 +669,7 @@ https://mirrors.sjtug.sjtu.edu.cn {
     }
     redir /docker-ce /docker-ce/ 301
     handle_path /docker-ce/* {
-        redir * {scheme}://ftp.sjtu.edu.cn/docker-ce{uri} 302
+        redir * https://mirror.sjtu.edu.cn/docker-ce{uri} 302
     }
     redir /fedora/linux /fedora/linux/ 301
     handle_path /fedora/linux/* {

diff --git a/config.siyuan.yaml b/config.siyuan.yaml
@@ -229,11 +229,14 @@ repos:
     target: "{scheme}://ftp.sjtu.edu.cn/deepin-cd"
     <<: *oneshot_common
   # docker-ce
-  - type: external
+  - type: shell_script
     name: docker-ce
-    serve_mode: redir
-    target: "{scheme}://ftp.sjtu.edu.cn/docker-ce"
+    script: /worker-script/rsync-fetcher.sh
+    source: rsync://mirrors6.tuna.tsinghua.edu.cn/docker-ce/
+    interval: 4900
+    serve_mode: rsync_gateway
     no_redir_http: true
+    <<: *rsync_fetcher_common
     <<: *oneshot_common
   # fedora/linux
   - type: external

diff --git a/rsync-gateway/config.siyuan.toml b/rsync-gateway/config.siyuan.toml
@@ -67,6 +67,11 @@ namespace = "opencloudos"
 s3_bucket = "899a892efef34b1b944a19981040f55b-oss01"
 s3_prefix = "rsync/opencloudos"
 
+[endpoints.docker-ce]
+namespace = "docker-ce"
+s3_bucket = "899a892efef34b1b944a19981040f55b-oss01"
+s3_prefix = "rsync/docker-ce"
+
 [endpoints.openkylin]
 namespace = "openkylin"
 s3_bucket = "899a892efef34b1b944a19981040f55b-oss01"