From 2426086ed3791c95966f10f74207c73408a02d0f Mon Sep 17 00:00:00 2001 From: cysamurai Date: Tue, 14 Apr 2026 21:55:10 +0800 Subject: [PATCH] 1 --- README.md | 1 + scripts/build-linux-deb-all.sh | 2 +- scripts/docker/Dockerfile | 5 +++-- scripts/docker/install-build-deps.sh | 6 +++--- scripts/docker/run-build.sh | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 03e67d9..aa0ea5e 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ ```bash cd /path/to/TauriClient +chmod +x ./scripts/docker/run-build.sh ./scripts/docker/run-build.sh ``` diff --git a/scripts/build-linux-deb-all.sh b/scripts/build-linux-deb-all.sh index 7de0910..e1ab2a1 100644 --- a/scripts/build-linux-deb-all.sh +++ b/scripts/build-linux-deb-all.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# 在 Ubuntu 24.04.x(x86_64 宿主机)上为多个 Tauri v1 + Vue 项目打出 amd64 与 arm64 的 .deb。 +# 在 Linux(x86_64 宿主机)上为多个 Tauri v1 + Vue 项目打出 amd64 与 arm64 的 .deb。 # # 依赖: # - Node/npm、Rust、@tauri-apps/cli diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index c312ad7..56f1090 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -1,7 +1,8 @@ # 用于在 x86_64 上打出 amd64 + arm64 的 .deb(与 build-linux-deb-all.sh 一致)。 -# 构建:在仓库根目录执行 docker build -f scripts/docker/Dockerfile -t tauri-linux-deb:24.04 . +# 基底使用 Ubuntu 22.04(jammy),以提供 webkit2gtk/javascriptcoregtk 4.0 开发包。 +# 构建:在仓库根目录执行 docker build -f scripts/docker/Dockerfile -t tauri-linux-deb:22.04 . # 勿在纯 arm64 宿主机上用本镜像交叉打 amd64(需另做镜像或仅用真机构建)。 -FROM ubuntu:24.04 +FROM ubuntu:22.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 358f275..b81d5a1 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: noble noble-updates noble-backports +Suites: jammy jammy-updates jammy-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: noble-security +Suites: jammy-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: noble noble-updates noble-backports noble-security +Suites: jammy jammy-updates jammy-backports jammy-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 8365c0a..b7fea38 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:24.04}" +IMAGE_TAG="${IMAGE_TAG:-tauri-linux-deb:22.04}" RUN_MODE="${RUN_MODE:-docker}" # docker: dual-container all; hybrid: host amd64 + docker arm64 PROJECT_ARGS=()