fix: 将 Docker 工具验证改为可选,并优化 Docker 登录和输出逻辑

- 将 Docker 验证从必需改为可选(required=false)
- Docker 登录步骤增加版本检测条件,避免 Docker 不可用时执行登录
- 环境配置总结中仅在 Docker 可用时显示版本信息
- 优化错误处理:Docker 缺失不再阻塞流程,kubectl 保持必需验证
This commit is contained in:
Lyda
2026-03-12 15:02:05 +08:00
parent f37db72f86
commit e3ca3af8d3
2 changed files with 5 additions and 3 deletions
+3 -1
View File
@@ -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
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
+1 -1
View File
@@ -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"
}