From ab4d3d8f7228db1c780c441cbbbb9a5048fabd9f Mon Sep 17 00:00:00 2001
From: llody <745719408@qq.com>
Date: Wed, 12 Jun 2024 16:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md      | 150 +++++++++++--------------------------------------
 sync_images.py |   6 +-
 2 files changed, 37 insertions(+), 119 deletions(-)

diff --git a/README.md b/README.md
index 520a6b3..25e77d1 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
 ```yaml
 images:
   llody/udocker:
-    - tag: v1.1.1
     - tag: latest
+    - tag: v1.1.1
   llody/weixin-robot:
     - tag: v1-amd64
     - tag: v1-arm64
@@ -45,12 +45,7 @@ images:
     - tag: latest
     - tag: 8.0.32-1.2.11-server
     - tag: 8.0.32
-    - tag: 8.0
-    - tag: 8.0.30-1.2.9-server
-    - tag: 8.0.30
-    - tag: 8.0.27-1.2.6-server
     - tag: 8.0.27
-    - tag: 8.0.26
     - tag: 5.7.41-1.2.11-server
     - tag: 5.7.41
     - tag: 5.7
@@ -62,131 +57,54 @@ images:
     - tag: 6.2
     - tag: 6.0
     - tag: 5.0
-  mongo:
-    - tag: latest
-    - tag: 6.0.5
-    - tag: 6.0
-    - tag: 5.0
   rabbitmq:
    - tag: latest
-   - tag: 3.13.3-management
-   - tag: 3.13.3
-   - tag: 3.12.14-management
-   - tag: 3.12.14
-   - tag: 3.11.14-management
-   - tag: 3.11.14
-   - tag: 3.10.14-management
-   - tag: 3.10.14
-   - tag: 3.9.14-management
-   - tag: 3.9.14
+   - tag: 3.9.9-management
+   - tag: 3.9.9
    - tag: 3.8.26-management
    - tag: 3.8.26
+  mongo:
+    - tag: latest
+    - tag: 7.0.9
+    - tag: 7.0
+    - tag: 6
+    - tag: 6.0
+    - tag: 6
+    - tag: 5.0
+    - tag: 5
+  golang:
+    - tag: latest
+    - tag: 1.22.4
+    - tag: 1.21.4
+    - tag: 1.20.4
+    - tag: 1.19.4
+  portainer/portainer-ce:
+    - tag: latest
+    - tag: 2.20.3
   elasticsearch:
-    - tag: 8.4.3
-    - tag: 8.4.2
-    - tag: 8.4.1
-    - tag: 8.4
-    - tag: 8.3.3
-    - tag: 8.3.2
-    - tag: 8.3.1
-    - tag: 8.3
-    - tag: 8.2.3
-    - tag: 8.2.2
-    - tag: 8.2.1
-    - tag: 8.2
-    - tag: 8.1.3
-    - tag: 8.1.2
-    - tag: 8.1.1
-    - tag: 8.1
-    - tag: 8.0.2
-    - tag: 8.0.1
-    - tag: 8.0
-    - tag: 7.17.21
-    - tag: 7.17.19
-    - tag: 7.17.17
+    - tag: 8.9.2
+    - tag: 7.9.3
+    - tag: 7.17.14
     - tag: 7.17.4
   kibana:
-    - tag: 8.4.3
-    - tag: 8.4.2
-    - tag: 8.4.1
-    - tag: 8.4
-    - tag: 8.3.3
-    - tag: 8.3.2
-    - tag: 8.3.1
-    - tag: 8.3
-    - tag: 8.2.3
-    - tag: 8.2.2
-    - tag: 8.2.1
-    - tag: 8.2
-    - tag: 8.1.3
-    - tag: 8.1.2
-    - tag: 8.1.1
-    - tag: 8.1
-    - tag: 8.0.2
-    - tag: 8.0.1
-    - tag: 8.0
-    - tag: 7.17.21
-    - tag: 7.17.19
-    - tag: 7.17.17
+    - tag: 8.9.2
+    - tag: 7.9.3
+    - tag: 7.17.14
     - tag: 7.17.4
   logstash:
-    - tag: 8.4.3
-    - tag: 8.4.2
-    - tag: 8.4.1
-    - tag: 8.4
-    - tag: 8.3.3
-    - tag: 8.3.2
-    - tag: 8.3.1
-    - tag: 8.3
-    - tag: 8.2.3
-    - tag: 8.2.2
-    - tag: 8.2.1
-    - tag: 8.2
-    - tag: 8.1.3
-    - tag: 8.1.2
-    - tag: 8.1.1
-    - tag: 8.1
-    - tag: 8.0.2
-    - tag: 8.0.1
-    - tag: 8.0
-    - tag: 7.17.21
-    - tag: 7.17.19
-    - tag: 7.17.17
+    - tag: 8.9.2
+    - tag: 7.9.3
+    - tag: 7.17.14
     - tag: 7.17.4
   fluentd:
     - tag: 2.1.1
     - tag: 2.1.0
     - tag: 2.0.1
     - tag: 2.0.0
-  fluent-bit:
-    - tag: 1.9.1
-    - tag: 1.9.0
-    - tag: 1.8.12
-    - tag: 1.8.11
-    - tag: 1.8.10
-    - tag: 1.8.9
-    - tag: 1.8.8
-    - tag: 1.8.7
-    - tag: 1.8.6
-    - tag: 1.8.5
-    - tag: 1.8.4
-    - tag: 1.8.3
-    - tag: 1.8.2
-    - tag: 1.8.1
-    - tag: 1.8.0
-    - tag: 1.7.10
-    - tag: 1.7.9
-    - tag: 1.7.8
-    - tag: 1.7.7
-    - tag: 1.7.6
-    - tag: 1.7.5
-    - tag: 1.7.4
-    - tag: 1.7.3
-    - tag: 1.7.2
-    - tag: 1.7.1
-    - tag: 1.7.0
-    - tag: 1.6.12
-    - tag: 1.6.11
+  fluent/fluent-bit:
+    - tag: 3.0.7
+    - tag: 2.2.1
+    - tag: 1.9.9
   
 
 ```
diff --git a/sync_images.py b/sync_images.py
index fe95a5f..f7c9222 100644
--- a/sync_images.py
+++ b/sync_images.py
@@ -2,7 +2,7 @@
 Author: llody 745719408@qq.com
 Date: 2024-06-11 18:07:57
 LastEditors: llody 745719408@qq.com
-LastEditTime: 2024-06-12 11:35:36
+LastEditTime: 2024-06-12 16:33:56
 FilePath: \sync-images\.github\workflows\app\sync_images.py
 Description: 批量镜像同步脚本
 '''
@@ -38,8 +38,8 @@
         source_image = f"docker://docker.io/{image_name}:{tag}"
         
         if org_name == namespace:
-            aliyun_target_image = f"docker://{aliyun_registry}/{repo_name}:{tag}"
-            huawei_target_image = f"docker://{huawei_registry}/{repo_name}:{tag}"
+            aliyun_target_image = f"docker://{aliyun_registry}/{namespace}/{repo_name}:{tag}"
+            huawei_target_image = f"docker://{huawei_registry}/{namespace}/{repo_name}:{tag}"
         else:
             # aliyun_target_image = f"docker://{aliyun_registry}/{namespace}/{org_name}-{repo_name}:{tag}"
             # huawei_target_image = f"docker://{huawei_registry}/{namespace}/{org_name}-{repo_name}:{tag}"