From 602d25faa73f2855bb97dc7919d34dfb567f4cc7 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 10:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20Login=20to=20GitHub=20Cont?=
 =?UTF-8?q?ainer=20Registry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml     | 16 ++++++++++++++--
 docker-build-push/action.yml | 18 +-----------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9b4c9b..8cacdeb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,14 +15,26 @@ jobs:
         run: |
           set -x
           which pnpm
+
   docker-build-push-test:
     runs-on: ubuntu-latest
     steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - uses: yanhao98/composite-actions/docker-build-push@main
         id: docker-build-push
         with:
-          login_username: ${{ secrets.DOCKERHUB_USERNAME }}
-          login_password: ${{ secrets.DOCKERHUB_TOKEN }}
           build_file: ./docker-build-push/Dockerfile
           build_platforms: linux/amd64
           build_push: false
diff --git a/docker-build-push/action.yml b/docker-build-push/action.yml
index 57e0aa0..765a02e 100644
--- a/docker-build-push/action.yml
+++ b/docker-build-push/action.yml
@@ -1,16 +1,6 @@
 name: "打包推送 Docker 镜像"
 description: "打包 Docker 镜像并推送到 Docker Hub"
 inputs:
-  login_repository:
-    description: "docker/login-action 的 registry 参数"
-    default: "docker.io"
-    required: false
-  login_username:
-    description: "docker/login-action 的 username 参数"
-    required: true
-  login_password:
-    description: "docker/login-action 的 password 参数"
-    required: true
   build_file:
     description: "Dockerfile 文件路径"
     default: "./Dockerfile"
@@ -25,7 +15,6 @@ inputs:
     required: false
   build_push:
     description: "是否推送 Docker 镜像"
-    default: "true"
     required: false
   build_load:
     description: "是否加载 Docker 镜像"
@@ -48,18 +37,13 @@ runs:
       with:
         filter: blob:none
         show-progress: false
+    # https://docs.docker.com/build/ci/github-actions/push-multi-registries/
     - name: Extract metadata
       id: meta
       uses: docker/metadata-action@v5 # https://github.com/docker/metadata-action
       with:
         images: ${{ inputs.metadata_images }}
         tags: ${{ inputs.metadata_tags }}
-    - name: Login to DockerHub
-      uses: docker/login-action@v3
-      with:
-        registry: ${{ inputs.login_repository }}
-        username: ${{ inputs.login_username }}
-        password: ${{ inputs.login_password }}
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
     - name: Set up Docker Buildx