From 44743d780d0ed8c95d16b175434f2cb81688758c Mon Sep 17 00:00:00 2001 From: ira james Date: Tue, 19 Aug 2025 11:20:10 +0800 Subject: [PATCH 01/44] Update images.txt --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 8b13789..9b3986f 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ - +mysql:8.0.1 From 930745bfa69a8133734b5c480780dd142a23c87f Mon Sep 17 00:00:00 2001 From: ira james Date: Tue, 2 Sep 2025 13:42:10 +0800 Subject: [PATCH 02/44] Update images.txt --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 9b3986f..5c6a20d 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -mysql:8.0.1 +elasticsearch:7.17.7 From abb7537e21bb53a79c4f591f4c3feccf1e1247cb Mon Sep 17 00:00:00 2001 From: ira james Date: Tue, 9 Sep 2025 17:05:48 +0800 Subject: [PATCH 03/44] Update images.txt --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 5c6a20d..6fbb48a 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -elasticsearch:7.17.7 +canal/canal-server:v1.1.8 From ad3913e5e012c09ff3cc0c2cda0aed4c008bd7b9 Mon Sep 17 00:00:00 2001 From: ira james Date: Wed, 24 Sep 2025 16:56:46 +0800 Subject: [PATCH 04/44] Update images.txt --- images.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 6fbb48a..d4c8109 100644 --- a/images.txt +++ b/images.txt @@ -1 +1,2 @@ -canal/canal-server:v1.1.8 +redis:6.2.11 +mysql:8.0.32 From 5ad69cd5d6e19aadb36b08ae019fc99fdcd451cc Mon Sep 17 00:00:00 2001 From: xrj4j Date: Mon, 29 Sep 2025 20:36:04 +0800 Subject: [PATCH 05/44] test arm --- .gitignore | 4 +++- images.txt | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0156556..756d778 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -cmd/conf.yaml \ No newline at end of file +cmd/conf.yaml +.idea +.vscode \ No newline at end of file diff --git a/images.txt b/images.txt index d4c8109..2f6d3a2 100644 --- a/images.txt +++ b/images.txt @@ -1,2 +1 @@ -redis:6.2.11 -mysql:8.0.32 +--platform linux/arm64 redis:6.2.11 From e6e024e6504e109616ea8fd34ce04a7c6cff24d4 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Mon, 29 Sep 2025 21:07:33 +0800 Subject: [PATCH 06/44] test arm --- .github/workflows/sync.yaml | 3 +++ images.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index 730c0cb..20d6249 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -3,6 +3,9 @@ run-name: ${{ github.actor }} is running GitHub Actions on: [push] jobs: Sync-Docker-Image-Actions: + strategy: + matrix: + platform: [ linux/amd64, linux/arm64 ] runs-on: ubuntu-latest steps: - name: Check out repository code diff --git a/images.txt b/images.txt index 2f6d3a2..8ed3be1 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ ---platform linux/arm64 redis:6.2.11 +redis:6.2.11 From a445efe61958520ac7e2ce80210dfb739d3ea3f0 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Mon, 29 Sep 2025 23:44:03 +0800 Subject: [PATCH 07/44] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=8B=89=E5=8F=96=E9=98=BF=E9=87=8C=E4=BA=91=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E7=9A=84=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images.txt | 2 +- pull_ali.bat | 44 ++++++++++++++++++++++++++++++++++++++++++++ pull_ali.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 pull_ali.bat create mode 100644 pull_ali.sh diff --git a/images.txt b/images.txt index 8ed3be1..edc412f 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -redis:6.2.11 +mysql:8.0.32 diff --git a/pull_ali.bat b/pull_ali.bat new file mode 100644 index 0000000..25dce1c --- /dev/null +++ b/pull_ali.bat @@ -0,0 +1,44 @@ +@echo off +setlocal enabledelayedexpansion + +REM 检查images.txt文件是否存在 +if not exist "images.txt" ( + echo 错误: images.txt 文件不存在 + pause + exit /b 1 +) + +REM 读取images.txt文件的每一行 +for /f "usebackq tokens=*" %%i in ("images.txt") do ( + REM 跳过空行 + if not "%%i"=="" ( + set "original_image=%%i" + set "new_image=registry.cn-hangzhou.aliyuncs.com/xrj4j/%%i" + + echo 正在处理镜像: !original_image! + + REM 拉取镜像 + echo 拉取镜像: !new_image! + docker pull "!new_image!" + + if !errorlevel! equ 0 ( + REM 重新标记镜像 + echo 标记镜像: !new_image! 为 !original_image! + docker tag "!new_image!" "!original_image!" + + if !errorlevel! equ 0 ( + echo 成功处理镜像: !original_image! + docker rmi "!new_image!" + ) else ( + echo 错误: 无法标记镜像 !original_image! + ) + ) else ( + echo 错误: 无法拉取镜像 !new_image! + ) + + echo ---------------------------------------- + ) +) + +echo 所有镜像处理完成 +pause diff --git a/pull_ali.sh b/pull_ali.sh new file mode 100644 index 0000000..b300ca2 --- /dev/null +++ b/pull_ali.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +# 检查images.txt文件是否存在 +if [ ! -f "images.txt" ]; then + echo "错误: images.txt 文件不存在" + exit 1 +fi + +# 读取images.txt文件的每一行 +while IFS= read -r line; do + # 跳过空行 + if [ -z "$line" ]; then + continue + fi + + # 原始镜像名称 + original_image="$line" + + # 拼接新的镜像名称 + new_image="registry.cn-hangzhou.aliyuncs.com/xrj4j/$line" + + echo "正在处理镜像: $original_image" + + # 拉取镜像 + echo "拉取镜像: $new_image" + docker pull "$new_image" + + if [ $? -eq 0 ]; then + # 重新标记镜像 + echo "标记镜像: $new_image 为 $original_image" + docker tag "$new_image" "$original_image" + + if [ $? -eq 0 ]; then + echo "成功处理镜像: $original_image" + docker rmi "$new_image" + else + echo "错误: 无法标记镜像 $original_image" + fi + else + echo "错误: 无法拉取镜像 $new_image" + fi + + echo "----------------------------------------" +done < "images.txt" + +echo "所有镜像处理完成" From d99e1e4c6b7a089d80e19713129df7f716774be1 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 15:36:54 +0800 Subject: [PATCH 08/44] =?UTF-8?q?feat(sync):=20=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E9=95=9C=E5=83=8F=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 sync.sh 脚本中新增对目标平台参数的支持 - 修改 docker pull 命令以指定平台拉取镜像 - 更新 GitHub Actions 工作流配置，传递平台参数 - 向 images.txt 文件中添加 Redis 镜像记录 --- .github/workflows/sync.yaml | 2 +- images.txt | 1 + pull_ali.sh | 0 sync.sh | 3 ++- 4 files changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 pull_ali.sh diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index 20d6249..fb174f7 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -15,5 +15,5 @@ jobs: docker login -u "${{ secrets.DOCKER_USER }}" -p "${{ secrets.DOCKER_PWD }}" "${{ secrets.DOCKER_REGISTRY }}" - name: execute sync.sh run: | - bash "${{ github.workspace }}/sync.sh" "${{ github.workspace }}/images.txt" "${{ secrets.DOCKER_REGISTRY }}" "${{ secrets.DOCKER_NS }}" + bash "${{ github.workspace }}/sync.sh" "${{ github.workspace }}/images.txt" "${{ secrets.DOCKER_REGISTRY }}" "${{ secrets.DOCKER_NS }}" "${{ matrix.platform }}" - run: echo "This job's status is ${{ job.status }}" diff --git a/images.txt b/images.txt index edc412f..d3ff95c 100644 --- a/images.txt +++ b/images.txt @@ -1 +1,2 @@ mysql:8.0.32 +redis:7.2.4 diff --git a/pull_ali.sh b/pull_ali.sh old mode 100644 new mode 100755 diff --git a/sync.sh b/sync.sh index 06ec01f..85f54bf 100644 --- a/sync.sh +++ b/sync.sh @@ -13,6 +13,7 @@ fi IMAGES_FILE=$1 TARGET_REGISTRY=$2 TARGET_NAMESPACE=$3 +TARGET_PLATFORM=$4 # 检查文件是否存在 if [ ! -f "$IMAGES_FILE" ]; then @@ -25,7 +26,7 @@ failed_images="" while IFS= read -r image; do # 拉取镜像 set +e - docker pull "$image" + docker pull --platform="$TARGET_PLATFORM" "$image" pull_status=$? if [ $pull_status -ne 0 ]; then echo "Error: Failed to pull image $image, continuing..." From 4e0649e8f0c88913686f2165adf42bd42b660dd3 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 15:38:21 +0800 Subject: [PATCH 09/44] =?UTF-8?q?fix(sync):=20=E6=9B=B4=E6=96=B0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=8F=82=E6=95=B0=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将参数数量检查从3个更新为4个- 添加了platform参数的说明 - 保持了原有的错误提示和用法说明格式 --- sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync.sh b/sync.sh index 85f54bf..569ea22 100644 --- a/sync.sh +++ b/sync.sh @@ -3,8 +3,8 @@ set -eux # 检查参数数量是否正确 -if [ "$#" -ne 3 ]; then - echo "错误：脚本需要3个参数 images_file、docker_registry和docker_namespace" +if [ "$#" -ne 4 ]; then + echo "错误：脚本需要4个参数 images_file、docker_registry、docker_namespace、platform" echo "用法: $0 " exit 1 fi From 75bc35ba0433d930ca1b614e086d9eaf5e5f7031 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 15:38:37 +0800 Subject: [PATCH 10/44] =?UTF-8?q?fix(sync):=20=E6=9B=B4=E6=96=B0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=8F=82=E6=95=B0=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将参数数量检查从3个更新为4个- 添加了platform参数的说明 - 保持了原有的错误提示和用法说明格式 --- sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sync.sh b/sync.sh index 569ea22..3ac9780 100644 --- a/sync.sh +++ b/sync.sh @@ -5,7 +5,7 @@ set -eux # 检查参数数量是否正确 if [ "$#" -ne 4 ]; then echo "错误：脚本需要4个参数 images_file、docker_registry、docker_namespace、platform" - echo "用法: $0 " + echo "用法: $0 " exit 1 fi From af245c02ed708f8c4837fffcb0e9e813e9f5b682 Mon Sep 17 00:00:00 2001 From: ira james Date: Tue, 19 Aug 2025 11:20:10 +0800 Subject: [PATCH 11/44] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=A4=9A?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E9=95=9C=E5=83=8F=E5=90=8C=E6=AD=A5=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync.yaml | 5 ++++- .gitignore | 4 +++- images.txt | 3 ++- sync.sh | 9 +++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index 730c0cb..fb174f7 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -3,6 +3,9 @@ run-name: ${{ github.actor }} is running GitHub Actions on: [push] jobs: Sync-Docker-Image-Actions: + strategy: + matrix: + platform: [ linux/amd64, linux/arm64 ] runs-on: ubuntu-latest steps: - name: Check out repository code @@ -12,5 +15,5 @@ jobs: docker login -u "${{ secrets.DOCKER_USER }}" -p "${{ secrets.DOCKER_PWD }}" "${{ secrets.DOCKER_REGISTRY }}" - name: execute sync.sh run: | - bash "${{ github.workspace }}/sync.sh" "${{ github.workspace }}/images.txt" "${{ secrets.DOCKER_REGISTRY }}" "${{ secrets.DOCKER_NS }}" + bash "${{ github.workspace }}/sync.sh" "${{ github.workspace }}/images.txt" "${{ secrets.DOCKER_REGISTRY }}" "${{ secrets.DOCKER_NS }}" "${{ matrix.platform }}" - run: echo "This job's status is ${{ job.status }}" diff --git a/.gitignore b/.gitignore index 0156556..756d778 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -cmd/conf.yaml \ No newline at end of file +cmd/conf.yaml +.idea +.vscode \ No newline at end of file diff --git a/images.txt b/images.txt index 8b13789..d3ff95c 100644 --- a/images.txt +++ b/images.txt @@ -1 +1,2 @@ - +mysql:8.0.32 +redis:7.2.4 diff --git a/sync.sh b/sync.sh index 06ec01f..3ac9780 100644 --- a/sync.sh +++ b/sync.sh @@ -3,9 +3,9 @@ set -eux # 检查参数数量是否正确 -if [ "$#" -ne 3 ]; then - echo "错误：脚本需要3个参数 images_file、docker_registry和docker_namespace" - echo "用法: $0 " +if [ "$#" -ne 4 ]; then + echo "错误：脚本需要4个参数 images_file、docker_registry、docker_namespace、platform" + echo "用法: $0 " exit 1 fi @@ -13,6 +13,7 @@ fi IMAGES_FILE=$1 TARGET_REGISTRY=$2 TARGET_NAMESPACE=$3 +TARGET_PLATFORM=$4 # 检查文件是否存在 if [ ! -f "$IMAGES_FILE" ]; then @@ -25,7 +26,7 @@ failed_images="" while IFS= read -r image; do # 拉取镜像 set +e - docker pull "$image" + docker pull --platform="$TARGET_PLATFORM" "$image" pull_status=$? if [ $pull_status -ne 0 ]; then echo "Error: Failed to pull image $image, continuing..." From cca28acad8fdeed79f6e9f069f36701bca096e4e Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 16:54:18 +0800 Subject: [PATCH 12/44] refactor: add docker tags: nginx --- pull_ali.bat | 44 -------------------------------------------- pull_ali.sh | 46 ---------------------------------------------- 2 files changed, 90 deletions(-) delete mode 100644 pull_ali.bat delete mode 100755 pull_ali.sh diff --git a/pull_ali.bat b/pull_ali.bat deleted file mode 100644 index 25dce1c..0000000 --- a/pull_ali.bat +++ /dev/null @@ -1,44 +0,0 @@ -@echo off -setlocal enabledelayedexpansion - -REM 检查images.txt文件是否存在 -if not exist "images.txt" ( - echo 错误: images.txt 文件不存在 - pause - exit /b 1 -) - -REM 读取images.txt文件的每一行 -for /f "usebackq tokens=*" %%i in ("images.txt") do ( - REM 跳过空行 - if not "%%i"=="" ( - set "original_image=%%i" - set "new_image=registry.cn-hangzhou.aliyuncs.com/xrj4j/%%i" - - echo 正在处理镜像: !original_image! - - REM 拉取镜像 - echo 拉取镜像: !new_image! - docker pull "!new_image!" - - if !errorlevel! equ 0 ( - REM 重新标记镜像 - echo 标记镜像: !new_image! 为 !original_image! - docker tag "!new_image!" "!original_image!" - - if !errorlevel! equ 0 ( - echo 成功处理镜像: !original_image! - docker rmi "!new_image!" - ) else ( - echo 错误: 无法标记镜像 !original_image! - ) - ) else ( - echo 错误: 无法拉取镜像 !new_image! - ) - - echo ---------------------------------------- - ) -) - -echo 所有镜像处理完成 -pause diff --git a/pull_ali.sh b/pull_ali.sh deleted file mode 100755 index b300ca2..0000000 --- a/pull_ali.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# 检查images.txt文件是否存在 -if [ ! -f "images.txt" ]; then - echo "错误: images.txt 文件不存在" - exit 1 -fi - -# 读取images.txt文件的每一行 -while IFS= read -r line; do - # 跳过空行 - if [ -z "$line" ]; then - continue - fi - - # 原始镜像名称 - original_image="$line" - - # 拼接新的镜像名称 - new_image="registry.cn-hangzhou.aliyuncs.com/xrj4j/$line" - - echo "正在处理镜像: $original_image" - - # 拉取镜像 - echo "拉取镜像: $new_image" - docker pull "$new_image" - - if [ $? -eq 0 ]; then - # 重新标记镜像 - echo "标记镜像: $new_image 为 $original_image" - docker tag "$new_image" "$original_image" - - if [ $? -eq 0 ]; then - echo "成功处理镜像: $original_image" - docker rmi "$new_image" - else - echo "错误: 无法标记镜像 $original_image" - fi - else - echo "错误: 无法拉取镜像 $new_image" - fi - - echo "----------------------------------------" -done < "images.txt" - -echo "所有镜像处理完成" From c769a11cbf8fef71a2901ccab3f533024002da6d Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 17:00:56 +0800 Subject: [PATCH 13/44] test --- cmd/docker_pull | 0 images.txt | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) mode change 100644 => 100755 cmd/docker_pull diff --git a/cmd/docker_pull b/cmd/docker_pull old mode 100644 new mode 100755 diff --git a/images.txt b/images.txt index d3ff95c..8b13789 100644 --- a/images.txt +++ b/images.txt @@ -1,2 +1 @@ -mysql:8.0.32 -redis:7.2.4 + From 2b92c6b1853fa3f2b674437c3af133b5e2e49db3 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 17:18:46 +0800 Subject: [PATCH 14/44] refactor: add docker tags: nginx --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 8b13789..68b7d12 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ - +nginx From 00092ca18342fdc9e8f4dd50af8fde4b91c4f1bf Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 17:22:45 +0800 Subject: [PATCH 15/44] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20arm=20?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync.yaml | 4 +++- cmd/docker_pull | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index fb174f7..f2b5348 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -5,7 +5,9 @@ jobs: Sync-Docker-Image-Actions: strategy: matrix: - platform: [ linux/amd64, linux/arm64 ] + platform: +# - linux/amd64 + - linux/arm64 runs-on: ubuntu-latest steps: - name: Check out repository code diff --git a/cmd/docker_pull b/cmd/docker_pull index c096336..5d1a985 100755 --- a/cmd/docker_pull +++ b/cmd/docker_pull @@ -104,12 +104,12 @@ for tag in "$@"; do last_part=$(basename "$tag") full_tag="$REGISTRY_URL/$REGISTRY_NS/$last_part" success=0 - + for ((attempt=1; attempt<=MAX_RETRIES; attempt++)); do if [ $success -eq 0 ]; then echo "[Attempt $attempt/$MAX_RETRIES] Pulling $full_tag" docker pull "$full_tag" - + if [ $? -eq 0 ]; then success=1 echo "[pull images] Successfully pulled $full_tag, now delete origin image $full_tag:" @@ -122,7 +122,7 @@ for tag in "$@"; do fi fi done - + if [ $success -eq 0 ]; then echo "[pull images] Failed to pull $full_tag after $MAX_RETRIES attempts" FAILED_TAGS+=("$tag") From bf97515deacf0a284fce5df099300f18f3e7ea94 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 17:24:34 +0800 Subject: [PATCH 16/44] refactor: add docker tags: elasticsearch --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 68b7d12..174c3f8 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -nginx +elasticsearch From 11f8fda0900591ad93af2b7be8468227358b0fb9 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 17:27:39 +0800 Subject: [PATCH 17/44] refactor: add docker tags: elasticsearch:9.1.4 --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 174c3f8..f21a4f4 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -elasticsearch +elasticsearch:9.1.4 From 1b1aee9753e1b7e56189f2a77fb4feb673217bd3 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 17:36:57 +0800 Subject: [PATCH 18/44] refactor: add docker tags: nginx:1.29.1 --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 8b13789..4a43a8c 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ - +nginx:1.29.1 From c39ef73eebd7083a53681995591878fcf437e8b0 Mon Sep 17 00:00:00 2001 From: xrj4j Date: Tue, 30 Sep 2025 17:41:26 +0800 Subject: [PATCH 19/44] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=20arm=20?= =?UTF-8?q?=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index 6dbae7e..f2b5348 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -6,7 +6,7 @@ jobs: strategy: matrix: platform: - - linux/amd64 +# - linux/amd64 - linux/arm64 runs-on: ubuntu-latest steps: From 439efbcb1c002e5ac6e297800e88180b5d8a516c Mon Sep 17 00:00:00 2001 From: ira james Date: Fri, 7 Nov 2025 13:53:37 +0800 Subject: [PATCH 20/44] refactor: add docker tags: mysql:8.4.5 --- images.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/images.txt b/images.txt index 4a43a8c..e69de29 100644 --- a/images.txt +++ b/images.txt @@ -1 +0,0 @@ -nginx:1.29.1 From d208ebfb0585e9fc71e2daab2526aa5a3d917aee Mon Sep 17 00:00:00 2001 From: ira james Date: Fri, 7 Nov 2025 14:05:15 +0800 Subject: [PATCH 21/44] refactor: add docker tags: mysql:8.4.5 --- cmd/images.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 cmd/images.txt diff --git a/cmd/images.txt b/cmd/images.txt new file mode 100644 index 0000000..93e1a34 --- /dev/null +++ b/cmd/images.txt @@ -0,0 +1 @@ +mysql:8.4.5 From b7c690f75192b6ce104d9630ffa12b5f7b41d325 Mon Sep 17 00:00:00 2001 From: ira james Date: Fri, 7 Nov 2025 14:09:14 +0800 Subject: [PATCH 22/44] refactor: add docker tags: mysql:8.4.5 --- images.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/images.txt b/images.txt index e69de29..93e1a34 100644 --- a/images.txt +++ b/images.txt @@ -0,0 +1 @@ +mysql:8.4.5 From 92ed6eb85d601966d286f7bcaa7cd90fef27be10 Mon Sep 17 00:00:00 2001 From: ira james Date: Fri, 7 Nov 2025 14:12:43 +0800 Subject: [PATCH 23/44] refactor: add docker tags: bitnamilegacy/redis:8.0 bitnamilegacy/elasticsearch:8.18.0 minio/minio:RELEASE.2025-06-13T11-33-47Z-cpuv1 bitnamilegacy/etcd:3.5 milvusdb/milvus:v2.5.10 nsqio/nsq:v1.2.1 nsqio/nsq:v1.2.1 nsqio/nsq:v1.2.1 --- images.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 93e1a34..3cf675a 100644 --- a/images.txt +++ b/images.txt @@ -1 +1,8 @@ -mysql:8.4.5 +bitnamilegacy/redis:8.0 +bitnamilegacy/elasticsearch:8.18.0 +minio/minio:RELEASE.2025-06-13T11-33-47Z-cpuv1 +bitnamilegacy/etcd:3.5 +milvusdb/milvus:v2.5.10 +nsqio/nsq:v1.2.1 +nsqio/nsq:v1.2.1 +nsqio/nsq:v1.2.1 From 883b4f63af40701340693580c65df4015d6edb86 Mon Sep 17 00:00:00 2001 From: ira james Date: Fri, 7 Nov 2025 14:55:32 +0800 Subject: [PATCH 24/44] refactor: add docker tags: golang:1.24-alpine node:22-alpine nginx:1.25-alpine alpine:3.22.0 --- images.txt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/images.txt b/images.txt index 3cf675a..681467b 100644 --- a/images.txt +++ b/images.txt @@ -1,8 +1,4 @@ -bitnamilegacy/redis:8.0 -bitnamilegacy/elasticsearch:8.18.0 -minio/minio:RELEASE.2025-06-13T11-33-47Z-cpuv1 -bitnamilegacy/etcd:3.5 -milvusdb/milvus:v2.5.10 -nsqio/nsq:v1.2.1 -nsqio/nsq:v1.2.1 -nsqio/nsq:v1.2.1 +golang:1.24-alpine +node:22-alpine +nginx:1.25-alpine +alpine:3.22.0 From aef0ff4545254d8b9e5abc124dda8a385d04bb8b Mon Sep 17 00:00:00 2001 From: ira james Date: Fri, 7 Nov 2025 15:16:35 +0800 Subject: [PATCH 25/44] refactor: add docker tags: cozedev/coze-studio-server cozedev/coze-studio-web --- images.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/images.txt b/images.txt index 681467b..af02b0f 100644 --- a/images.txt +++ b/images.txt @@ -1,4 +1,2 @@ -golang:1.24-alpine -node:22-alpine -nginx:1.25-alpine -alpine:3.22.0 +cozedev/coze-studio-server +cozedev/coze-studio-web From 173c22460b73d783ad08d3752c172b2cde89c781 Mon Sep 17 00:00:00 2001 From: ira james Date: Mon, 10 Nov 2025 09:18:54 +0800 Subject: [PATCH 26/44] refactor: add docker tags: kindest/node:v1.26.3 --- images.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images.txt b/images.txt index af02b0f..72d8cd1 100644 --- a/images.txt +++ b/images.txt @@ -1,2 +1 @@ -cozedev/coze-studio-server -cozedev/coze-studio-web +kindest/node:v1.26.3 From a4fdae9e20b06f4906cb9e0d1e009af5a4151d83 Mon Sep 17 00:00:00 2001 From: ira james Date: Tue, 11 Nov 2025 16:02:03 +0800 Subject: [PATCH 27/44] refactor: add docker tags: nacos/nacos-server:latest --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 72d8cd1..60d61e4 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -kindest/node:v1.26.3 +nacos/nacos-server:latest From 86e212fafa6285585e190d7b14a0a7908759081b Mon Sep 17 00:00:00 2001 From: ira james Date: Tue, 18 Nov 2025 17:09:17 +0800 Subject: [PATCH 28/44] fix: amd64 --- .github/workflows/sync.yaml | 4 ++-- images.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index f2b5348..2fe7c85 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -6,8 +6,8 @@ jobs: strategy: matrix: platform: -# - linux/amd64 - - linux/arm64 + - linux/amd64 +# - linux/arm64 runs-on: ubuntu-latest steps: - name: Check out repository code diff --git a/images.txt b/images.txt index 60d61e4..9859e36 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -nacos/nacos-server:latest +mysql:8.0.32 \ No newline at end of file From db65fc53f76b5aebe7d854414773e53a2ae33e34 Mon Sep 17 00:00:00 2001 From: ira james Date: Tue, 18 Nov 2025 17:20:13 +0800 Subject: [PATCH 29/44] refactor: add docker tags: mysql:8.0.32 --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 9859e36..edc412f 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -mysql:8.0.32 \ No newline at end of file +mysql:8.0.32 From 9e41801edc4a18c868e4591463779f0c10be7721 Mon Sep 17 00:00:00 2001 From: ira james Date: Mon, 24 Nov 2025 12:57:46 +0800 Subject: [PATCH 30/44] refactor: add docker tags: redis:6.2.11 --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index edc412f..8ed3be1 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -mysql:8.0.32 +redis:6.2.11 From 4ded8f332631bb0d148bcee0f92dc4288ef2a8b0 Mon Sep 17 00:00:00 2001 From: xrj Date: Tue, 9 Dec 2025 21:44:19 +0800 Subject: [PATCH 31/44] refactor: add docker tags: redis --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 8ed3be1..7800f0f 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -redis:6.2.11 +redis From c969de1c224d0558789945fefd091f93fb75a519 Mon Sep 17 00:00:00 2001 From: xrj Date: Tue, 9 Dec 2025 21:45:43 +0800 Subject: [PATCH 32/44] refactor: add docker tags: mysql --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 7800f0f..0eaebf1 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -redis +mysql From ede27450ee8ad477a19968a036073761ff8f5897 Mon Sep 17 00:00:00 2001 From: xrj Date: Tue, 9 Dec 2025 22:11:10 +0800 Subject: [PATCH 33/44] =?UTF-8?q?feat:=20=E6=8B=89=E5=8F=96=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E6=97=B6=E5=90=8C=E6=97=B6=E6=8B=89=E5=8F=96arm?= =?UTF-8?q?=E5=92=8Camd=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sync.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml index 2fe7c85..39c40ad 100644 --- a/.github/workflows/sync.yaml +++ b/.github/workflows/sync.yaml @@ -7,7 +7,7 @@ jobs: matrix: platform: - linux/amd64 -# - linux/arm64 + - linux/arm64 runs-on: ubuntu-latest steps: - name: Check out repository code @@ -17,5 +17,10 @@ jobs: docker login -u "${{ secrets.DOCKER_USER }}" -p "${{ secrets.DOCKER_PWD }}" "${{ secrets.DOCKER_REGISTRY }}" - name: execute sync.sh run: | - bash "${{ github.workspace }}/sync.sh" "${{ github.workspace }}/images.txt" "${{ secrets.DOCKER_REGISTRY }}" "${{ secrets.DOCKER_NS }}" "${{ matrix.platform }}" + if [[ "${{ matrix.platform }}" == "linux/arm64" ]]; then + NS="${{ secrets.DOCKER_NS_ARM }}" + else + NS="${{ secrets.DOCKER_NS }}" + fi + bash "${{ github.workspace }}/sync.sh" "${{ github.workspace }}/images.txt" "${{ secrets.DOCKER_REGISTRY }}" "$NS" "${{ matrix.platform }}" - run: echo "This job's status is ${{ job.status }}" From a6064a7321e0a44efc9077c21b63796b2d39eb2c Mon Sep 17 00:00:00 2001 From: xrj Date: Tue, 9 Dec 2025 22:24:00 +0800 Subject: [PATCH 34/44] =?UTF-8?q?feat:=20=E6=8B=89=E5=8F=96=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E6=97=B6=E5=90=8C=E6=97=B6=E6=8B=89=E5=8F=96arm?= =?UTF-8?q?=E5=92=8Camd=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5b903a5..3500dc0 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,8 @@ ![image](images/077GE2yiN_IRLeapyG-PvWwf2xKNMgeiVPtFWVIW-GA.png) +这里创建两个命名空间，一个用于x86架构，一个用于arm架构，方便后续脚本配置 + 记住该命名空间名称，后续配置会用到。 4. **记录登录凭证** @@ -98,7 +100,8 @@ fork开源仓库[https://github.com/you8023/docker\_images\_sync](https://github * `DOCKER_USER`：阿里云账户 * `DOCKER_PWD`：2.1中第2步设置的阿里云镜像仓库密码 * `DOCKER_REGISTRY`：2.1中第4步中记住的登录凭证页面中的仓库地址 -* `DOCKER_NS`：2.1中第3步创建的命名空间名称 +* `DOCKER_NS`：2.1中第3步创建的x86架构的命名空间名称 +* `DOCKER_NS_ARM`：2.1中第3步创建的arm64架构的命名空间名称 添加后应能看到： @@ -112,9 +115,9 @@ fork开源仓库[https://github.com/you8023/docker\_images\_sync](https://github 1. 复制本地仓库中的`cmd/conf.yaml.default`文件并命名为`cmd/conf.yaml` 2. 编辑`cmd/conf.yaml` ，配置说明如下： -```bash +```yaml registry: 阿里云个人镜像仓库地址，形如：crpi-xxx.cn-xxx.personal.cr.aliyuncs.com -namespace: 阿里云个人镜像仓库命名空间名称 +namespace: 阿里云个人镜像仓库命名空间名称(根据自己的cpu架构选择对应的命名空间) images_dir: git仓库路径，例如："E:\Git\docker_images_sync" max_retries: 拉取镜像重试次数，默认为60 retry_delay: 拉取镜像尝试间隔（秒），默认为1 From f7f663beb0c110bae8c0215a5020a9347acb7bab Mon Sep 17 00:00:00 2001 From: xrj Date: Wed, 10 Dec 2025 20:28:49 +0800 Subject: [PATCH 35/44] refactor: add docker tags: nacos/nacos-server:v3.1.1 --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 0eaebf1..677223b 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -mysql +nacos/nacos-server:v3.1.1 From 2aa71eb7d0cac6ad94e933017224474adfa71a3a Mon Sep 17 00:00:00 2001 From: xrj Date: Wed, 10 Dec 2025 23:31:33 +0800 Subject: [PATCH 36/44] refactor: add docker tags: yuxiaoyao520/jrebel-license-active-server:latest --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 677223b..559a127 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -nacos/nacos-server:v3.1.1 +yuxiaoyao520/jrebel-license-active-server:latest From a77ab58fb23233f7d587b76cab9b2edbcad2f16d Mon Sep 17 00:00:00 2001 From: xrj Date: Thu, 11 Dec 2025 23:10:45 +0800 Subject: [PATCH 37/44] refactor: add docker tags: apache/apisix:3.14.1-debian bitnamilegacy/etcd:3.5.11 nginx:1.19.0-alpine prom/prometheus:v2.25.0 grafana/grafana:7.3.7 --- images.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 559a127..6198f1c 100644 --- a/images.txt +++ b/images.txt @@ -1 +1,5 @@ -yuxiaoyao520/jrebel-license-active-server:latest +apache/apisix:3.14.1-debian +bitnamilegacy/etcd:3.5.11 +nginx:1.19.0-alpine +prom/prometheus:v2.25.0 +grafana/grafana:7.3.7 From 04e884604ac338f831682ef0cd653b5d3854f355 Mon Sep 17 00:00:00 2001 From: xrj Date: Sat, 13 Dec 2025 17:09:10 +0800 Subject: [PATCH 38/44] refactor: add docker tags: oceanbase/oceanbase-ce --- images.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/images.txt b/images.txt index 6198f1c..e18e6f0 100644 --- a/images.txt +++ b/images.txt @@ -1,5 +1 @@ -apache/apisix:3.14.1-debian -bitnamilegacy/etcd:3.5.11 -nginx:1.19.0-alpine -prom/prometheus:v2.25.0 -grafana/grafana:7.3.7 +oceanbase/oceanbase-ce From 59e4071485d7981abbb965d23ebdf8fd904b1fdb Mon Sep 17 00:00:00 2001 From: xrj Date: Sun, 21 Dec 2025 18:39:43 +0800 Subject: [PATCH 39/44] refactor: add docker tags: cloudflare/cloudflared:latest --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index e18e6f0..00c4258 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -oceanbase/oceanbase-ce +cloudflare/cloudflared:latest From 8c59bfb14b5a1f3b0aad387a97abbee3bf5cd95a Mon Sep 17 00:00:00 2001 From: xrj Date: Sun, 18 Jan 2026 21:01:52 +0800 Subject: [PATCH 40/44] refactor: add docker tags: nginx:1.27.3 --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 00c4258..07de2db 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -cloudflare/cloudflared:latest +nginx:1.27.3 From 57d31c6c1d4433807c959fa60e9a04bcaec14311 Mon Sep 17 00:00:00 2001 From: ira james Date: Thu, 29 Jan 2026 11:04:56 +0800 Subject: [PATCH 41/44] refactor: add docker tags: rust:1.80 --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 07de2db..c424601 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -nginx:1.27.3 +rust:1.80 From db9c20f925ccc2d3c4e37a7c3ad3ec04697808e2 Mon Sep 17 00:00:00 2001 From: ira james Date: Sat, 28 Feb 2026 09:20:00 +0800 Subject: [PATCH 42/44] refactor: add docker tags: justlikemaki/openclaw-docker-cn-im:latest --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index c424601..871b2dd 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -rust:1.80 +justlikemaki/openclaw-docker-cn-im:latest From 695a2595673830664d134e03887907a43dd8b415 Mon Sep 17 00:00:00 2001 From: ira james Date: Sat, 28 Feb 2026 09:25:40 +0800 Subject: [PATCH 43/44] =?UTF-8?q?update:=20=E5=A2=9E=E5=A4=A7=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E5=BB=B6=E8=BF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/docker_pull | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/docker_pull b/cmd/docker_pull index c096336..0abaeb6 100755 --- a/cmd/docker_pull +++ b/cmd/docker_pull @@ -49,8 +49,8 @@ while IFS= read -r line || [ -n "$line" ]; do done < "$CONFIG_FILE" # Set defaults -MAX_RETRIES=${MAX_RETRIES:-60} -RETRY_DELAY=${RETRY_DELAY:-1} +MAX_RETRIES=${MAX_RETRIES:-120} +RETRY_DELAY=${RETRY_DELAY:-5} FIRST_DELAY=${FIRST_DELAY:-20} # Check required configurations From b585e0cc6b6e6ef90029862ef286e11bccf1de70 Mon Sep 17 00:00:00 2001 From: ira james Date: Sun, 17 May 2026 16:16:57 +0800 Subject: [PATCH 44/44] refactor: add docker tags: zhaojun1998/zfile:latest --- images.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images.txt b/images.txt index 871b2dd..30f04a3 100644 --- a/images.txt +++ b/images.txt @@ -1 +1 @@ -justlikemaki/openclaw-docker-cn-im:latest +zhaojun1998/zfile:latest