From bfeb8d238a6090c4fb5346c831c3af6a501da2f3 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 21 Aug 2025 12:45:05 +0800 Subject: [PATCH] fix build --- .github/workflows/beta.yml | 1 + docker/Dockerfile | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 7d62c7cf..97f0b337 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -52,6 +52,7 @@ jobs: file: docker/Dockerfile platforms: | linux/amd64 + linux/arm64/v8 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/docker/Dockerfile b/docker/Dockerfile index 49efc856..d22775a8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ busybox \ jq \ - wget + wget \ + && \ + if [ "$(uname -m)" = "x86_64" ]; \ + then ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1; \ + elif [ "$(uname -m)" = "aarch64" ]; \ + then ln -s /usr/lib/aarch64-linux-musl/libc.so /lib/libc.musl-aarch64.so.1; \ + fi # 安装 Python 构建依赖并创建虚拟环境 WORKDIR /app @@ -84,12 +90,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ffmpeg \ nano \ && dpkg-reconfigure --frontend noninteractive tzdata \ - && \ - if [ "$(uname -m)" = "x86_64" ]; \ - then ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1; \ - elif [ "$(uname -m)" = "aarch64" ]; \ - then ln -s /usr/lib/aarch64-linux-musl/libc.so /lib/libc.musl-aarch64.so.1; \ - fi \ && curl https://rclone.org/install.sh | bash \ && apt-get autoremove -y \ && apt-get clean \