Update docker-image.yml

.github/workflows/docker-image.yml

@@ -1,54 +1,81 @@
-name: Docker 镜像构建与推送
+name: Docker CI
 
 on:
   push:
-    branches: [ "master", "develop" ] # 触发分支
+    branches:
+      - master
+      - develop
+    tags:
+      - "v*.*.*"
+      - "v*"
+      - "*.*.*"
+      - "*.*.*-*"
   workflow_dispatch: # 允许手动触发工作流
 
 jobs:
-
+  build-amd64:
-  build:
+    name: 构建 AMD64 镜像
-
+    runs-on: ubuntu-24.04
-    runs-on: ubuntu-latest
+    outputs:
-    env:
+      digest: ${{ steps.build.outputs.digest }}
-      DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USERNAME }} # Docker Hub 用户名
-      DATE_TAG: $(date -u +'%Y-%m-%dT%H-%M-%S') # 用于生成时间戳标签
-
     steps:
-    - name: 检出代码
+      - name: 检出 Git 仓库
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 克隆 maim_message
+        uses: actions/checkout@v4
+        with:
+          repository: MaiM-with-u/maim_message
+          path: maim_message
+
+      - name: 克隆 MaiMBot-LPMM
+        uses: actions/checkout@v4
+        with:
+          repository: MaiM-with-u/MaiMBot-LPMM
+          path: MaiMBot-LPMM
 
       - name: 设置 Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
 
-    - name: 登录 Docker Hub
+      - name: 登录到 Docker Hub
         uses: docker/login-action@v3
         with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }} # Docker Hub 用户名
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }} # Docker Hub 密码
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-    - name: 克隆 maim_message 仓库
+      - name: Docker 元数据
-      run: git clone https://github.com/MaiM-with-u/maim_message maim_message
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ secrets.DOCKERHUB_USERNAME }}/maibot
 
-    - name: 确定镜像标签
+      - name: 动态生成镜像标签
-      id: tags
+        id: tag
         run: |
-        if [ "${{ github.ref_name }}" == "master" ]; then
+          if [ "$GITHUB_REF" == "refs/heads/master" ]; then
-          echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:latest,${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:master-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+            echo "tag=latest" >> $GITHUB_ENV
-        elif [ "${{ github.ref_name }}" == "develop" ]; then
+          elif [ "$GITHUB_REF" == "refs/heads/develop" ]; then
-          echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:dev,${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:develop-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+            echo "tag=dev" >> $GITHUB_ENV
+          else
+            echo "tag=${{ github.ref_name }}" >> $GITHUB_ENV
           fi
 
-    - name: 构建并推送 Docker 镜像
+      - name: 构建并推送 AMD64 镜像
+        id: build
         uses: docker/build-push-action@v5
         with:
-        context: . # 构建上下文
+          context: .
-        file: ./Dockerfile # Dockerfile 路径
+          platforms: linux/amd64
-        platforms: linux/amd64,linux/arm64 # 构建平台
+          labels: ${{ steps.meta.outputs.labels }}
-        tags: ${{ steps.tags.outputs.tags }} # 镜像标签
+          file: ./Dockerfile
-        push: true # 推送镜像
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:amd64-buildcache
-        cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:buildcache-${{ github.ref_name }} # 缓存来源
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:amd64-buildcache,mode=max
-        cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot-adapter:buildcache-${{ github.ref_name }},mode=max # 缓存目标
+          outputs: type=image,name=${{ secrets.DOCKERHUB_USERNAME }}/maibot:${{ env.tag }},push-by-digest=true,name-canonical=true,push=true
-        labels: |
+          build-args: |
-          org.opencontainers.image.created=${{ steps.tags.outputs.date_tag }} # 镜像创建时间
+            BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-          org.opencontainers.image.revision=${{ github.sha }} # 镜像修订版本
+            VCS_REF=${{ github.sha }}
+            BRANCH_NAME=${{ github.ref_name }}