From 7d625a36633178820518bf025b1146cba780d2ab Mon Sep 17 00:00:00 2001 From: cysamurai Date: Wed, 15 Apr 2026 15:14:56 +0800 Subject: [PATCH] 1 --- scripts/docker/Dockerfile | 6 +++--- scripts/docker/install-build-deps.sh | 6 +++--- scripts/docker/run-build.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 56f1090..9c86bea 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -1,8 +1,8 @@ # 用于在 x86_64 上打出 amd64 + arm64 的 .deb(与 build-linux-deb-all.sh 一致)。 -# 基底使用 Ubuntu 22.04(jammy),以提供 webkit2gtk/javascriptcoregtk 4.0 开发包。 -# 构建:在仓库根目录执行 docker build -f scripts/docker/Dockerfile -t tauri-linux-deb:22.04 . +# 基底使用 Ubuntu 20.04(focal),降低 glibc 版本以兼容麒麟 V10。 +# 构建:在仓库根目录执行 docker build -f scripts/docker/Dockerfile -t tauri-linux-deb:20.04 . # 勿在纯 arm64 宿主机上用本镜像交叉打 amd64(需另做镜像或仅用真机构建)。 -FROM ubuntu:22.04 +FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive \ RUSTUP_HOME=/opt/rustup \ diff --git a/scripts/docker/install-build-deps.sh b/scripts/docker/install-build-deps.sh index b81d5a1..9ec6cdc 100644 --- a/scripts/docker/install-build-deps.sh +++ b/scripts/docker/install-build-deps.sh @@ -11,21 +11,21 @@ rm -f /etc/apt/sources.list cat > /etc/apt/sources.list.d/ubuntu.sources <<'EOF' Types: deb URIs: http://archive.ubuntu.com/ubuntu/ -Suites: jammy jammy-updates jammy-backports +Suites: focal focal-updates focal-backports Components: main restricted universe multiverse Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg Architectures: amd64 Types: deb URIs: http://security.ubuntu.com/ubuntu -Suites: jammy-security +Suites: focal-security Components: main restricted universe multiverse Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg Architectures: amd64 Types: deb URIs: http://ports.ubuntu.com/ubuntu-ports/ -Suites: jammy jammy-updates jammy-backports jammy-security +Suites: focal focal-updates focal-backports focal-security Components: main restricted universe multiverse Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg Architectures: arm64 diff --git a/scripts/docker/run-build.sh b/scripts/docker/run-build.sh index b7fea38..cf16132 100644 --- a/scripts/docker/run-build.sh +++ b/scripts/docker/run-build.sh @@ -4,7 +4,7 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" -IMAGE_TAG="${IMAGE_TAG:-tauri-linux-deb:22.04}" +IMAGE_TAG="${IMAGE_TAG:-tauri-linux-deb:20.04}" RUN_MODE="${RUN_MODE:-docker}" # docker: dual-container all; hybrid: host amd64 + docker arm64 PROJECT_ARGS=()