From b6ea1e7f0769749e2e1b8455de2b2b3e72b03eb3 Mon Sep 17 00:00:00 2001 From: cysamurai Date: Fri, 10 Apr 2026 16:45:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/docker/install-build-deps.sh | 4 ++-- scripts/docker/run-build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/docker/install-build-deps.sh b/scripts/docker/install-build-deps.sh index b6da150..7438332 100644 --- a/scripts/docker/install-build-deps.sh +++ b/scripts/docker/install-build-deps.sh @@ -34,7 +34,7 @@ EOF apt-get update apt-get install -y --no-install-recommends \ ca-certificates curl gnupg git ubuntu-keyring \ - python3 python3-importlib-metadata python3-markdown + python3:amd64 python3-importlib-metadata:amd64 python3-markdown:amd64 # 本机构建 amd64 apt-get install -y --no-install-recommends \ @@ -53,7 +53,7 @@ apt-get install -y --no-install-recommends \ libssl-dev:arm64 libayatana-appindicator3-dev:arm64 librsvg2-dev:arm64 # 为避免 NodeSource 在 multiarch 场景触发 python3 依赖解算冲突，直接使用 Ubuntu 官方 nodejs/npm。 -apt-get install -y --no-install-recommends nodejs npm +apt-get install -y --no-install-recommends nodejs:amd64 npm:amd64 export RUSTUP_HOME=/opt/rustup export CARGO_HOME=/opt/cargo diff --git a/scripts/docker/run-build.sh b/scripts/docker/run-build.sh index 413e356..a74adf8 100644 --- a/scripts/docker/run-build.sh +++ b/scripts/docker/run-build.sh @@ -8,8 +8,8 @@ IMAGE_TAG="${IMAGE_TAG:-tauri-linux-deb:24.04}" cd "$REPO_ROOT" -echo "==> docker build -f scripts/docker/Dockerfile -t $IMAGE_TAG $REPO_ROOT" -docker build -f scripts/docker/Dockerfile -t "$IMAGE_TAG" "$REPO_ROOT" +echo "==> docker build --platform linux/amd64 -f scripts/docker/Dockerfile -t $IMAGE_TAG $REPO_ROOT" +docker build --platform linux/amd64 -f scripts/docker/Dockerfile -t "$IMAGE_TAG" "$REPO_ROOT" echo "==> docker run (npm ci + build-linux-deb-all.sh)" docker run --rm \