Merge pull request #629 from infinitycat233/refactor

添加mmc镜像workflow配置,优化了一下docker-compose
This commit is contained in:
SengokuCola
2025-04-01 21:33:24 +08:00
committed by GitHub
3 changed files with 15 additions and 5 deletions

View File

@@ -5,6 +5,7 @@ on:
branches:
- main
- main-fix
- refactor # 新增 refactor 分支触发
tags:
- 'v*'
workflow_dispatch:
@@ -16,6 +17,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Clone maim_message (refactor branch only)
if: github.ref == 'refs/heads/refactor' # 仅 refactor 分支执行
run: git clone https://github.com/MaiM-with-u/maim_message maim_message
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -34,6 +39,8 @@ jobs:
echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT
elif [ "${{ github.ref }}" == "refs/heads/main-fix" ]; then
echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main-fix" >> $GITHUB_OUTPUT
elif [ "${{ github.ref }}" == "refs/heads/refactor" ]; then # 新增 refactor 分支处理
echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:refactor" >> $GITHUB_OUTPUT
fi
- name: Build and Push Docker Image

View File

@@ -9,6 +9,7 @@ COPY requirements.txt .
COPY maim_message /maim_message
# 安装依赖
RUN pip install --upgrade pip
RUN pip install -e /maim_message
RUN pip install --upgrade -r requirements.txt

View File

@@ -1,7 +1,7 @@
services:
adapters:
container_name: maim-bot-adapters
image: maimbot-adapters:latest
image: sengokucola/maimbot-adapter:latest
environment:
- TZ=Asia/Shanghai
ports:
@@ -11,11 +11,13 @@ services:
- ./adapters/.env:/adapters/.env # 持久化adapters配置文件
- ./data/qq:/app/.config/QQ # 持久化QQ本体并同步qq表情和图片到adapters
restart: always
depends_on:
- mongodb
networks:
- maim_bot
core:
container_name: maim-bot-core
image: maimbot-core:latest
image: sengokucola/maimbot:refactor
environment:
- TZ=Asia/Shanghai
# - EULA_AGREE=35362b6ea30f12891d46ef545122e84a # 同意EULA
@@ -28,6 +30,8 @@ services:
- ./mmc-config/bot_config.toml:/MaiMBot/config/bot_config.toml # 持久化bot配置文件
- ./data/MaiMBot:/MaiMBot/data # NapCat 和 NoneBot 共享此卷,否则发送图片会有问题
restart: always
depends_on:
- mongodb
networks:
- maim_bot
mongodb:
@@ -51,8 +55,6 @@ services:
- NAPCAT_GID=1000
- TZ=Asia/Shanghai
ports:
- "3000:3000"
- "3001:3001"
- "6099:6099"
- "8095:8095"
volumes: