From 6db6f75e58a001524db2b9e227b22d08e7ee6472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E6=B5=A9?=
 <37316281+yanhao98@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20docker-build-push=20?=
 =?UTF-8?q?=E7=9A=84=20imageid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml     | 5 +++--
 docker-build-push/action.yml | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f44179..8271120 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,6 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: yanhao98/composite-actions/docker-build-push@main
+        id: docker-build-push
         with:
           login_username: ${{ secrets.DOCKERHUB_USERNAME }}
           login_password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -26,7 +27,6 @@ jobs:
           build_platforms: linux/amd64
           build_push: false
           build_load: true
-          build_tags: image-test
           metadata_images: |
             docker.io/murielmay67761/docker-example
           metadata_tags: |
@@ -35,4 +35,5 @@ jobs:
         run: |
           set -x;
           # docker run --rm image-test:latest whoami
-          docker images;
+          # docker images;
+          docker run --rm ${{ steps.docker-build-push.outputs.imageid }} whoami
diff --git a/docker-build-push/action.yml b/docker-build-push/action.yml
index 2406f76..5be0154 100644
--- a/docker-build-push/action.yml
+++ b/docker-build-push/action.yml
@@ -37,6 +37,10 @@ inputs:
   metadata_tags:
     description: "docker/metadata-action 的 tags 参数"
     required: false
+outputs:
+  imageid:
+    description: "Docker 镜像 ID"
+    value: ${{ steps.build.outputs.imageid }}
 runs:
   using: "composite"
   steps:
@@ -61,7 +65,8 @@ runs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
     - name: Build and push
-      uses: docker/build-push-action@v6
+      id: build
+      uses: docker/build-push-action@v6 # https://github.com/docker/build-push-action
       with:
         file: ${{ inputs.build_file }}
         context: ${{ inputs.build_context }}
@@ -69,7 +74,7 @@ runs:
         push: ${{ inputs.build_push }}
         load: ${{ inputs.build_load }}
         tags: ${{ steps.meta.outputs.tags }}
-        # labels: ${{ steps.meta.outputs.labels }}
+        labels: ${{ steps.meta.outputs.labels }}
         cache-from: type=gha
         cache-to: type=gha,mode=max
         # cache-from: type=local,src=/tmp/.buildx-cache