From e3ca3af8d3593505d403ba19f679e09c8f3b8c92 Mon Sep 17 00:00:00 2001
From: Lyda <1829913225@qq.com>
Date: Thu, 12 Mar 2026 15:02:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=86=20Docker=20=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=80=89=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=20Docker=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=92=8C=E8=BE=93=E5=87=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 Docker 验证从必需改为可选（required=false）
- Docker 登录步骤增加版本检测条件，避免 Docker 不可用时执行登录
- 环境配置总结中仅在 Docker 可用时显示版本信息
- 优化错误处理：Docker 缺失不再阻塞流程，kubectl 保持必需验证
---
 config-env/action.yml                | 6 ++++--
 config-env/scripts/validate-tools.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config-env/action.yml b/config-env/action.yml
index 656df87..940db78 100644
--- a/config-env/action.yml
+++ b/config-env/action.yml
@@ -82,7 +82,7 @@ runs:
       run: bash ${{ github.action_path }}/scripts/verify-kubectl.sh
 
     - name: 登录私有 Docker 仓库
-      if: ${{ inputs.skip-docker-login != 'true' }}
+      if: ${{ inputs.skip-docker-login != 'true' && steps.validate-tools.outputs.docker-version != 'not-found' && steps.validate-tools.outputs.docker-version != 'skipped' }}
       uses: docker/login-action@v3
       with:
         registry: ${{ inputs.docker-registry }}
@@ -94,7 +94,9 @@ runs:
       run: |
         echo '🎉 环境校验与配置步骤完成'
         if [[ "${{ inputs.enable-validation }}" != 'false' ]]; then
-          echo "  - Docker: ${{ steps.validate-tools.outputs.docker-version }}"
+          if [[ "${{ steps.validate-tools.outputs.docker-version }}" != 'not-found' && "${{ steps.validate-tools.outputs.docker-version }}" != 'skipped' ]]; then
+            echo "  - Docker: ${{ steps.validate-tools.outputs.docker-version }}"
+          fi
           echo "  - kubectl: ${{ steps.validate-tools.outputs.kubectl-version }}"
         fi
         if [[ "${{ inputs.kube-config }}" != '' && "${{ inputs.enable-validation }}" != 'false' ]]; then
diff --git a/config-env/scripts/validate-tools.sh b/config-env/scripts/validate-tools.sh
index 7475b16..d8d9234 100644
--- a/config-env/scripts/validate-tools.sh
+++ b/config-env/scripts/validate-tools.sh
@@ -67,7 +67,7 @@ main() {
         return 0
     fi
 
-    validate_binary "docker" "true" "docker --version" "docker-version"
+    validate_binary "docker" "false" "docker --version" "docker-version"
     validate_binary "kubectl" "true" "kubectl version --client --short 2>/dev/null || kubectl version --client" "kubectl-version"
 }