Merge pull request #629 from infinitycat233/refactor
添加mmc镜像workflow配置,优化了一下docker-compose
This commit is contained in:
9
.github/workflows/docker-image.yml
vendored
9
.github/workflows/docker-image.yml
vendored
@@ -5,6 +5,7 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- main-fix
|
- main-fix
|
||||||
|
- refactor # 新增 refactor 分支触发
|
||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
@@ -16,6 +17,10 @@ jobs:
|
|||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
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
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
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
|
echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT
|
||||||
elif [ "${{ github.ref }}" == "refs/heads/main-fix" ]; then
|
elif [ "${{ github.ref }}" == "refs/heads/main-fix" ]; then
|
||||||
echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main-fix" >> $GITHUB_OUTPUT
|
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
|
fi
|
||||||
|
|
||||||
- name: Build and Push Docker Image
|
- name: Build and Push Docker Image
|
||||||
@@ -45,4 +52,4 @@ jobs:
|
|||||||
tags: ${{ steps.tags.outputs.tags }}
|
tags: ${{ steps.tags.outputs.tags }}
|
||||||
push: true
|
push: true
|
||||||
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache
|
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache
|
||||||
cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max
|
cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max
|
||||||
@@ -9,6 +9,7 @@ COPY requirements.txt .
|
|||||||
COPY maim_message /maim_message
|
COPY maim_message /maim_message
|
||||||
|
|
||||||
# 安装依赖
|
# 安装依赖
|
||||||
|
RUN pip install --upgrade pip
|
||||||
RUN pip install -e /maim_message
|
RUN pip install -e /maim_message
|
||||||
RUN pip install --upgrade -r requirements.txt
|
RUN pip install --upgrade -r requirements.txt
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
services:
|
services:
|
||||||
adapters:
|
adapters:
|
||||||
container_name: maim-bot-adapters
|
container_name: maim-bot-adapters
|
||||||
image: maimbot-adapters:latest
|
image: sengokucola/maimbot-adapter:latest
|
||||||
environment:
|
environment:
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
ports:
|
ports:
|
||||||
@@ -11,11 +11,13 @@ services:
|
|||||||
- ./adapters/.env:/adapters/.env # 持久化adapters配置文件
|
- ./adapters/.env:/adapters/.env # 持久化adapters配置文件
|
||||||
- ./data/qq:/app/.config/QQ # 持久化QQ本体并同步qq表情和图片到adapters
|
- ./data/qq:/app/.config/QQ # 持久化QQ本体并同步qq表情和图片到adapters
|
||||||
restart: always
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- mongodb
|
||||||
networks:
|
networks:
|
||||||
- maim_bot
|
- maim_bot
|
||||||
core:
|
core:
|
||||||
container_name: maim-bot-core
|
container_name: maim-bot-core
|
||||||
image: maimbot-core:latest
|
image: sengokucola/maimbot:refactor
|
||||||
environment:
|
environment:
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
# - EULA_AGREE=35362b6ea30f12891d46ef545122e84a # 同意EULA
|
# - EULA_AGREE=35362b6ea30f12891d46ef545122e84a # 同意EULA
|
||||||
@@ -28,6 +30,8 @@ services:
|
|||||||
- ./mmc-config/bot_config.toml:/MaiMBot/config/bot_config.toml # 持久化bot配置文件
|
- ./mmc-config/bot_config.toml:/MaiMBot/config/bot_config.toml # 持久化bot配置文件
|
||||||
- ./data/MaiMBot:/MaiMBot/data # NapCat 和 NoneBot 共享此卷,否则发送图片会有问题
|
- ./data/MaiMBot:/MaiMBot/data # NapCat 和 NoneBot 共享此卷,否则发送图片会有问题
|
||||||
restart: always
|
restart: always
|
||||||
|
depends_on:
|
||||||
|
- mongodb
|
||||||
networks:
|
networks:
|
||||||
- maim_bot
|
- maim_bot
|
||||||
mongodb:
|
mongodb:
|
||||||
@@ -51,8 +55,6 @@ services:
|
|||||||
- NAPCAT_GID=1000
|
- NAPCAT_GID=1000
|
||||||
- TZ=Asia/Shanghai
|
- TZ=Asia/Shanghai
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
|
||||||
- "3001:3001"
|
|
||||||
- "6099:6099"
|
- "6099:6099"
|
||||||
- "8095:8095"
|
- "8095:8095"
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
Reference in New Issue
Block a user