From 0fdab73962a43c01fe3e21095d3b12c36f6f5d3a Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Jul 2025 16:09:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dadapters=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BA=86=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9bd7172c6..b2ce0a31e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,29 @@ services: adapters: container_name: maim-bot-adapters + #### prod #### image: unclas/maimbot-adapter:latest # image: infinitycat/maimbot-adapter:latest + #### dev #### + # image: unclas/maimbot-adapter:dev + # image: infinitycat/maimbot-adapter:dev environment: - TZ=Asia/Shanghai # ports: # - "8095:8095" volumes: - - ./docker-config/adapters/config.toml:/adapters/config.toml + - ./docker-config/adapters/config.toml:/adapters/config.toml # 持久化adapters配置文件 + - ./data/adapters:/adapters/data # adapters 数据持久化 restart: always networks: - maim_bot + core: container_name: maim-bot-core + #### prod #### image: sengokucola/maibot:latest # image: infinitycat/maibot:latest - # dev + #### dev #### # image: sengokucola/maibot:dev # image: infinitycat/maibot:dev environment: @@ -25,15 +32,15 @@ services: # - PRIVACY_AGREE=42dddb3cbe2b784b45a2781407b298a1 # 同意EULA # ports: # - "8000:8000" -# - "27017:27017" volumes: - ./docker-config/mmc/.env:/MaiMBot/.env # 持久化env配置文件 - ./docker-config/mmc:/MaiMBot/config # 持久化bot配置文件 - ./data/MaiMBot/maibot_statistics.html:/MaiMBot/maibot_statistics.html #统计数据输出 - - ./data/MaiMBot:/MaiMBot/data # NapCat 和 NoneBot 共享此卷,否则发送图片会有问题 + - ./data/MaiMBot:/MaiMBot/data # 共享目录 restart: always networks: - maim_bot + napcat: environment: - NAPCAT_UID=1000 @@ -43,13 +50,14 @@ services: - "6099:6099" volumes: - ./docker-config/napcat:/app/napcat/config # 持久化napcat配置文件 - - ./data/qq:/app/.config/QQ # 持久化QQ本体并同步qq表情和图片到adapters - - ./data/MaiMBot:/MaiMBot/data # NapCat 和 NoneBot 共享此卷,否则发送图片会有问题 + - ./data/qq:/app/.config/QQ # 持久化QQ本体 + - ./data/MaiMBot:/MaiMBot/data # 共享目录 container_name: maim-bot-napcat restart: always image: mlikiowa/napcat-docker:latest networks: - maim_bot + sqlite-web: image: coleifer/sqlite-web container_name: sqlite-web @@ -62,6 +70,7 @@ services: - SQLITE_DATABASE=MaiMBot/MaiBot.db # 你的数据库文件 networks: - maim_bot + networks: maim_bot: driver: bridge From b0e1e1b6e794e6307f5f005501d06aebfbce2532 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Thu, 3 Jul 2025 16:23:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=E5=BA=95?= =?UTF-8?q?=E5=B1=82=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 23165a23e..be76277c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13.2-slim-bookworm +FROM python:3.13.5-slim-bookworm COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ # 工作目录