mirror of https://github.com/Mai-with-u/MaiBot.git
fix: 修复docker-image.yml中的分支和标签配置,取消qemu更新arm服务器,更新docker-compose.yml格式
parent
61540464a7
commit
c10a0a1d78
|
|
@ -1,27 +1,23 @@
|
|||
name: Docker Build and Push
|
||||
|
||||
on:
|
||||
# push:
|
||||
# branches:
|
||||
# - main
|
||||
# - classical
|
||||
# - dev
|
||||
# tags:
|
||||
# - "v*.*.*"
|
||||
# - "v*"
|
||||
# - "*.*.*"
|
||||
# - "*.*.*-*"
|
||||
workflow_dispatch: # 允许手动触发工作流
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- classical
|
||||
- dev
|
||||
- dev-refactor
|
||||
tags:
|
||||
- "v*.*.*"
|
||||
- "v*"
|
||||
- "*.*.*"
|
||||
- "*.*.*-*"
|
||||
workflow_dispatch: # 允许手动触发工作流
|
||||
|
||||
# Workflow's jobs
|
||||
jobs:
|
||||
build-amd64:
|
||||
name: Build AMD64 Image
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-24.04
|
||||
outputs:
|
||||
digest: ${{ steps.build.outputs.digest }}
|
||||
steps:
|
||||
|
|
@ -74,7 +70,7 @@ jobs:
|
|||
|
||||
build-arm64:
|
||||
name: Build ARM64 Image
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-24.04-arm
|
||||
outputs:
|
||||
digest: ${{ steps.build.outputs.digest }}
|
||||
steps:
|
||||
|
|
@ -90,11 +86,6 @@ jobs:
|
|||
- name: Clone lpmm
|
||||
run: git clone https://github.com/MaiM-with-u/MaiMBot-LPMM.git MaiMBot-LPMM
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
with:
|
||||
platforms: arm64
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
with:
|
||||
|
|
@ -132,7 +123,7 @@ jobs:
|
|||
|
||||
create-manifest:
|
||||
name: Create Multi-Arch Manifest
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-24.04
|
||||
needs:
|
||||
- build-amd64
|
||||
- build-arm64
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ services:
|
|||
# - ./data/MaiMBot:/data/MaiMBot
|
||||
# networks:
|
||||
# - maim_bot
|
||||
|
||||
volumes:
|
||||
site-packages:
|
||||
networks:
|
||||
|
|
|
|||
Loading…
Reference in New Issue