ci: build both ARM64 and AMD64 docker image

Author: Wesley-Young

.dockerignore

@@ -4,11 +4,6 @@
 .idea
 .kotlin
 **/build
-!yogurt/build/
-!yogurt/build/bin/
-!yogurt/build/bin/linuxX64/
-!yogurt/build/bin/linuxX64/releaseExecutable/
-!yogurt/build/bin/linuxX64/releaseExecutable/yogurt.kexe
 **/node_modules
 acidify-core-js
 acidify-docs

.github/workflows/build-yogurt-pmhq.yml

@@ -207,7 +207,22 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: yogurt-linux-x64
-          path: yogurt/build/bin/linuxX64/releaseExecutable
+          path: docker/bin/linux-amd64
+
+      - name: Download linux-arm64 executable
+        uses: actions/download-artifact@v4
+        with:
+          name: yogurt-linux-arm64
+          path: docker/bin/linux-arm64
+
+      - name: Normalize Docker binaries
+        run: |
+          set -euo pipefail
+          mv docker/bin/linux-amd64/yogurt.kexe docker/bin/linux-amd64/yogurt
+          mv docker/bin/linux-arm64/yogurt.kexe docker/bin/linux-arm64/yogurt
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -241,7 +256,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}

README.md

@@ -20,7 +20,7 @@ services:
     privileged: true
     environment:
       - ENABLE_HEADLESS=true
-      - RUST_LOG=error # Suppress PMHQ log to make Yogurt log visible
+      - RUST_LOG=error
     volumes:
       - qq_volume:/root/.config/QQ
     networks:
@@ -36,13 +36,12 @@ services:
   yogurt:
     image: ghcr.io/llonebot/yogurt-pmhq:latest
     container_name: yogurt-pmhq
-    platform: linux/amd64
     environment:
       - PMHQ_HOST=pmhq
       - PMHQ_PORT=13000
       - YOGURT_HOST=0.0.0.0
       - YOGURT_PORT=3000
-      - YOGURT_ACCESS_TOKEN=change-me
+      - YOGURT_ACCESS_TOKEN=change-me # 请在此修改 Access Token，确保安全
       - HTTP_CORS_ORIGINS=
       - WEBHOOK_URLS=
       - WEBHOOK_ACCESS_TOKEN=
@@ -87,7 +86,7 @@ Yogurt 支持三种登录方式：当前登录状态继续、快速登录和二
   - 如果已经登录，则直接进入初始化；
   - 如果尚未登录，则进入二维码登录。
 
-PMHQ 的 QQ 配置目录会挂载到独立卷 `qq_volume`。Yogurt 的运行目录会挂载到 `./data`，启动时自动生成 `config.json` 和脚本目录，适合长期保留登录状态与本地数据。镜像内部运行的是 `linuxX64` 的 Kotlin/Native 可执行文件。
+PMHQ 的 QQ 配置目录会挂载到独立卷 `qq_volume`。Yogurt 的运行目录会挂载到 `./data`，启动时自动生成 `config.json` 和脚本目录，适合长期保留登录状态与本地数据。当前发布的 Docker 镜像同时包含 `amd64` 和 `arm64` 两种架构，Docker 会按宿主机自动拉取对应的原生二进制镜像。
 
 Yogurt 容器额外写入了 `host.docker.internal:host-gateway`，因此 webhook 或其他回调服务如果运行在宿主机上，也可以直接从容器内访问。如果你确实需要从宿主机直接访问 PMHQ，再自行给 `pmhq` 服务补端口映射即可。
 

docker/Dockerfile

@@ -1,15 +1,19 @@
 FROM debian:bookworm-slim
 
+ARG TARGETARCH
+
 RUN apt-get update \
     && apt-get install -y --no-install-recommends ca-certificates jq libcurl4 \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
-COPY yogurt/build/bin/linuxX64/releaseExecutable/yogurt.kexe /app/yogurt
+COPY docker/bin /tmp/docker-bin
 COPY docker/startup.sh /app/startup.sh
 
-RUN chmod +x /app/startup.sh /app/yogurt
+RUN cp "/tmp/docker-bin/linux-${TARGETARCH}/yogurt" /app/yogurt \
+    && rm -rf /tmp/docker-bin \
+    && chmod +x /app/startup.sh /app/yogurt
 
 ENV YOGURT_DATA_DIR=/app/data