From c10a0a1d783378a339a47ccf33c39fd6d4340fcf Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Fri, 25 Jul 2025 17:38:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddocker-image.yml?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=88=86=E6=94=AF=E5=92=8C=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8F=96=E6=B6=88qemu=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0arm=E6=9C=8D=E5=8A=A1=E5=99=A8=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0docker-compose.yml=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-image.yml | 31 +++++++++++-------------------
 docker-compose.yml                 |  1 +
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 36f5ba8f..fb514291 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,27 +1,23 @@
 name: Docker Build and Push
 
 on:
-  # push:
-  #   branches:
-  #     - main
-  #     - classical
-  #     - dev
-  #   tags:
-  #     - "v*.*.*"
-  #     - "v*"
-  #     - "*.*.*"
-  #     - "*.*.*-*"
-  workflow_dispatch: # 允许手动触发工作流
+  push:
     branches:
       - main
+      - classical
       - dev
-      - dev-refactor
+    tags:
+      - "v*.*.*"
+      - "v*"
+      - "*.*.*"
+      - "*.*.*-*"
+  workflow_dispatch: # 允许手动触发工作流
 
 # Workflow's jobs
 jobs:
   build-amd64:
     name: Build AMD64 Image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       digest: ${{ steps.build.outputs.digest }}
     steps:
@@ -74,7 +70,7 @@ jobs:
 
   build-arm64:
     name: Build ARM64 Image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     outputs:
       digest: ${{ steps.build.outputs.digest }}
     steps:
@@ -90,11 +86,6 @@ jobs:
       - name: Clone lpmm
         run: git clone https://github.com/MaiM-with-u/MaiMBot-LPMM.git MaiMBot-LPMM
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
@@ -132,7 +123,7 @@ jobs:
 
   create-manifest:
     name: Create Multi-Arch Manifest
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs:
       - build-amd64
       - build-arm64
diff --git a/docker-compose.yml b/docker-compose.yml
index e4519d30..3bcf0e54 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -84,6 +84,7 @@ services:
   #     - ./data/MaiMBot:/data/MaiMBot
   #   networks:
   #     - maim_bot
+  
 volumes:
   site-packages:
 networks: