From 268eafe3eeacdcfd22ad0f4497104b266acb3a93 Mon Sep 17 00:00:00 2001
From: infinitycat <zouliwei4848@outlook.com>
Date: Mon, 8 Dec 2025 15:04:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=E5=88=86=E6=94=AF=E8=BE=93=E5=85=A5=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E7=BC=93=E5=AD=98=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-image-dev.yml  | 19 ++++++++++++-------
 .github/workflows/docker-image-main.yml |  5 +++++
 docker-compose.yml                      |  6 +++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml
index fe911b0f..dc43f1ae 100644
--- a/.github/workflows/docker-image-dev.yml
+++ b/.github/workflows/docker-image-dev.yml
@@ -3,10 +3,15 @@ name: Docker Build and Push (Dev)
 on:
   schedule:
     - cron: '0 0 * * *'
-  push:
-    branches:
-      - dev
+  # push:
+  #   branches:
+  #     - dev
   workflow_dispatch: # 允许手动触发工作流
+    inputs:
+      branch:
+        description: 'Branch to build'
+        required: false
+        default: 'dev'
 
 # Workflow's jobs
 jobs:
@@ -57,8 +62,8 @@ jobs:
           platforms: linux/amd64
           labels: ${{ steps.meta.outputs.labels }}
           file: ./Dockerfile
-          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:amd64-buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:amd64-buildcache,mode=max
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:dev-amd64-buildcache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:dev-amd64-buildcache,mode=max
           outputs: type=image,name=${{ secrets.DOCKERHUB_USERNAME }}/maibot,push-by-digest=true,name-canonical=true,push=true
           build-args: |
             BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -111,8 +116,8 @@ jobs:
           platforms: linux/arm64/v8
           labels: ${{ steps.meta.outputs.labels }}
           file: ./Dockerfile
-          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:arm64-buildcache
-          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:arm64-buildcache,mode=max
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:dev-arm64-buildcache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maibot:dev-arm64-buildcache,mode=max
           outputs: type=image,name=${{ secrets.DOCKERHUB_USERNAME }}/maibot,push-by-digest=true,name-canonical=true,push=true
           build-args: |
             BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
diff --git a/.github/workflows/docker-image-main.yml b/.github/workflows/docker-image-main.yml
index e20c928a..25dc67ea 100644
--- a/.github/workflows/docker-image-main.yml
+++ b/.github/workflows/docker-image-main.yml
@@ -11,6 +11,11 @@ on:
       - "*.*.*"
       - "*.*.*-*"
   workflow_dispatch: # 允许手动触发工作流
+    inputs:
+      branch:
+        description: 'Branch to build'
+        required: false
+        default: 'main'
 
 # Workflow's jobs
 jobs:
diff --git a/docker-compose.yml b/docker-compose.yml
index 217ae187..06124848 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       - ./data/MaiMBot:/MaiMBot/data # 共享目录
       - ./data/MaiMBot/plugins:/MaiMBot/plugins # 插件目录
       - ./data/MaiMBot/logs:/MaiMBot/logs # 日志目录
-      - site-packages:/usr/local/lib/python3.13/site-packages # 持久化Python包
+      # - site-packages:/usr/local/lib/python3.13/site-packages # 持久化Python包，需要时启用
     restart: always
     networks:
       - maim_bot
@@ -87,8 +87,8 @@ services:
   #   networks:
   #     - maim_bot
   
-volumes:
-  site-packages:
+# volumes:         #  若需要持久化Python包时启用
+#   site-packages:
 networks:
   maim_bot:
     driver: bridge