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
|
name: Docker Build and Push
|
||||||
|
|
||||||
on:
|
on:
|
||||||
# push:
|
push:
|
||||||
# branches:
|
|
||||||
# - main
|
|
||||||
# - classical
|
|
||||||
# - dev
|
|
||||||
# tags:
|
|
||||||
# - "v*.*.*"
|
|
||||||
# - "v*"
|
|
||||||
# - "*.*.*"
|
|
||||||
# - "*.*.*-*"
|
|
||||||
workflow_dispatch: # 允许手动触发工作流
|
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
- classical
|
||||||
- dev
|
- dev
|
||||||
- dev-refactor
|
tags:
|
||||||
|
- "v*.*.*"
|
||||||
|
- "v*"
|
||||||
|
- "*.*.*"
|
||||||
|
- "*.*.*-*"
|
||||||
|
workflow_dispatch: # 允许手动触发工作流
|
||||||
|
|
||||||
# Workflow's jobs
|
# Workflow's jobs
|
||||||
jobs:
|
jobs:
|
||||||
build-amd64:
|
build-amd64:
|
||||||
name: Build AMD64 Image
|
name: Build AMD64 Image
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
outputs:
|
outputs:
|
||||||
digest: ${{ steps.build.outputs.digest }}
|
digest: ${{ steps.build.outputs.digest }}
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -74,7 +70,7 @@ jobs:
|
||||||
|
|
||||||
build-arm64:
|
build-arm64:
|
||||||
name: Build ARM64 Image
|
name: Build ARM64 Image
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04-arm
|
||||||
outputs:
|
outputs:
|
||||||
digest: ${{ steps.build.outputs.digest }}
|
digest: ${{ steps.build.outputs.digest }}
|
||||||
steps:
|
steps:
|
||||||
|
|
@ -90,11 +86,6 @@ jobs:
|
||||||
- name: Clone lpmm
|
- name: Clone lpmm
|
||||||
run: git clone https://github.com/MaiM-with-u/MaiMBot-LPMM.git MaiMBot-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
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
with:
|
with:
|
||||||
|
|
@ -132,7 +123,7 @@ jobs:
|
||||||
|
|
||||||
create-manifest:
|
create-manifest:
|
||||||
name: Create Multi-Arch Manifest
|
name: Create Multi-Arch Manifest
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-24.04
|
||||||
needs:
|
needs:
|
||||||
- build-amd64
|
- build-amd64
|
||||||
- build-arm64
|
- build-arm64
|
||||||
|
|
|
||||||
|
|
@ -84,6 +84,7 @@ services:
|
||||||
# - ./data/MaiMBot:/data/MaiMBot
|
# - ./data/MaiMBot:/data/MaiMBot
|
||||||
# networks:
|
# networks:
|
||||||
# - maim_bot
|
# - maim_bot
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
site-packages:
|
site-packages:
|
||||||
networks:
|
networks:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue