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