From c6f1368298c2678d7364f1425f14570970f54c79 Mon Sep 17 00:00:00 2001
From: Katelya <123220557+katelya77@users.noreply.github.com>
Date: Sun, 31 Aug 2025 15:46:15 +0800
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 709edf9..b61feec 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -84,10 +84,9 @@ jobs:
         if: github.event_name != 'pull_request'
         run: |
           mkdir -p /tmp/digests
-          # 获取构建输出的 digest（可能是 list digest）
           list_digest="${{ steps.build.outputs.digest }}"
-          # 使用 imagetools inspect 提取内层 manifest digest（假设单平台，所以 Manifests 数组只有一个元素）
-          manifest_digest=$(docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${list_digest} --format '{{json .Manifests}}' | jq -r '.[0].digest')
+          # 使用 Go template 条件提取 digest：如果有 Manifests，取第一个的 Digest；否则取顶层 Digest
+          manifest_digest=$(docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${list_digest} --format '{{ if .Manifests }}{{ (index .Manifests 0).Digest }}{{ else }}{{ .Digest }}{{ end }}')
           touch "/tmp/digests/${manifest_digest#sha256:}"
       - name: Upload digest
         if: github.event_name != 'pull_request'