mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-07-13 00:13:02 +08:00
fix: resolve docker rust toolchain path
This commit is contained in:
@@ -24,9 +24,19 @@ function WARN() {
|
|||||||
VENV_PATH="${VENV_PATH:-/opt/venv}"
|
VENV_PATH="${VENV_PATH:-/opt/venv}"
|
||||||
export PATH="${VENV_PATH}/bin:$PATH"
|
export PATH="${VENV_PATH}/bin:$PATH"
|
||||||
|
|
||||||
|
# 配置 Rust 工具链目录,避免 Docker 中 HOME 与 root 真实主目录不一致时 rustup 无法推断路径。
|
||||||
|
function configure_rust_build_env() {
|
||||||
|
local home_dir="${HOME:-/root}"
|
||||||
|
export CARGO_HOME="${CARGO_HOME:-${home_dir}/.cargo}"
|
||||||
|
export RUSTUP_HOME="${RUSTUP_HOME:-${home_dir}/.rustup}"
|
||||||
|
if [[ ":${PATH}:" != *":${CARGO_HOME}/bin:"* ]]; then
|
||||||
|
export PATH="${CARGO_HOME}/bin:$PATH"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# 按需准备 Rust 构建环境,避免把工具链常驻打进 Docker runtime 镜像。
|
# 按需准备 Rust 构建环境,避免把工具链常驻打进 Docker runtime 镜像。
|
||||||
function ensure_rust_build_env() {
|
function ensure_rust_build_env() {
|
||||||
export PATH="/root/.cargo/bin:$PATH"
|
configure_rust_build_env
|
||||||
if command -v cargo > /dev/null 2>&1; then
|
if command -v cargo > /dev/null 2>&1; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
@@ -47,7 +57,7 @@ function ensure_rust_build_env() {
|
|||||||
ERROR "安装 Rust 工具链失败"
|
ERROR "安装 Rust 工具链失败"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
export PATH="/root/.cargo/bin:$PATH"
|
configure_rust_build_env
|
||||||
command -v cargo > /dev/null 2>&1
|
command -v cargo > /dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user