master
cysamurai 2 months ago
parent 645c5a19bc
commit b6ea1e7f07

@ -34,7 +34,7 @@ EOF
apt-get update apt-get update
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ca-certificates curl gnupg git ubuntu-keyring \ ca-certificates curl gnupg git ubuntu-keyring \
python3 python3-importlib-metadata python3-markdown python3:amd64 python3-importlib-metadata:amd64 python3-markdown:amd64
# 本机构建 amd64 # 本机构建 amd64
apt-get install -y --no-install-recommends \ 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 libssl-dev:arm64 libayatana-appindicator3-dev:arm64 librsvg2-dev:arm64
# 为避免 NodeSource 在 multiarch 场景触发 python3 依赖解算冲突,直接使用 Ubuntu 官方 nodejs/npm。 # 为避免 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 RUSTUP_HOME=/opt/rustup
export CARGO_HOME=/opt/cargo export CARGO_HOME=/opt/cargo

@ -8,8 +8,8 @@ IMAGE_TAG="${IMAGE_TAG:-tauri-linux-deb:24.04}"
cd "$REPO_ROOT" cd "$REPO_ROOT"
echo "==> 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 -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)" echo "==> docker run (npm ci + build-linux-deb-all.sh)"
docker run --rm \ docker run --rm \

Loading…
Cancel
Save