Skip to content
Merged

Dev #1613

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/docker-image-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ jobs:
# - name: Clone maim_message
# run: git clone https://github.com/MaiM-with-u/maim_message maim_message

- name: Clone lpmm
run: git clone https://github.com/Mai-with-u/MaiMBot-LPMM.git MaiMBot-LPMM

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
Expand Down Expand Up @@ -84,9 +81,6 @@ jobs:
# - name: Clone maim_message
# run: git clone https://github.com/MaiM-with-u/maim_message maim_message

- name: Clone lpmm
run: git clone https://github.com/Mai-with-u/MaiMBot-LPMM.git MaiMBot-LPMM

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/docker-image-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ jobs:
# - name: Clone maim_message
# run: git clone https://github.com/MaiM-with-u/maim_message maim_message

- name: Clone lpmm
run: git clone https://github.com/Mai-with-u/MaiMBot-LPMM.git MaiMBot-LPMM

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
Expand Down Expand Up @@ -87,9 +84,6 @@ jobs:
# - name: Clone maim_message
# run: git clone https://github.com/MaiM-with-u/maim_message maim_message

- name: Clone lpmm
run: git clone https://github.com/Mai-with-u/MaiMBot-LPMM.git MaiMBot-LPMM

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
Expand Down
35 changes: 9 additions & 26 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,44 +1,27 @@
# 编译 LPMM
FROM python:3.13-slim AS lpmm-builder
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/

WORKDIR /MaiMBot-LPMM

# 同级目录下需要有 MaiMBot-LPMM
COPY MaiMBot-LPMM /MaiMBot-LPMM

# 安装编译器和编译依赖
RUN apt-get update && apt-get install -y build-essential
RUN uv pip install --system --upgrade pip
RUN cd /MaiMBot-LPMM && uv pip install --system -r requirements.txt

# 编译 LPMM
RUN cd /MaiMBot-LPMM/lib/quick_algo && python build_lib.py --cleanup --cythonize --install

# 运行环境
# Runtime image
FROM python:3.13-slim
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/

# 工作目录
# Working directory
WORKDIR /MaiMBot

ENV MAIBOT_LEGACY_0X_UPGRADE_CONFIRMED=1

# 复制依赖列表
# Copy dependency list
COPY requirements.txt .

RUN apt-get update && apt-get install -y git

# 从编译阶段复制 LPMM 编译结果
COPY --from=lpmm-builder /usr/local/lib/python3.13/site-packages/ /usr/local/lib/python3.13/site-packages/

# 安装运行时依赖
# Install runtime dependencies
RUN uv pip install --system --upgrade pip
RUN uv pip install --system -r requirements.txt

# 复制项目代码
# Copy project source
COPY . .

RUN git clone --depth 1 --branch plugin https://github.com/Mai-with-u/MaiBot-Napcat-Adapter.git plugin-templates/MaiBot-Napcat-Adapter
RUN chmod +x docker-entrypoint.sh

EXPOSE 8000

ENTRYPOINT [ "python","bot.py" ]
ENTRYPOINT [ "./docker-entrypoint.sh" ]
604 changes: 404 additions & 200 deletions changelogs/changelog.md

Large diffs are not rendered by default.

Loading
Loading