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" }