diff --git a/scripts/docker/container-entry.sh b/scripts/docker/container-entry.sh index f167027..7652222 100644 --- a/scripts/docker/container-entry.sh +++ b/scripts/docker/container-entry.sh @@ -3,7 +3,7 @@ set -euo pipefail cd /work BUILD_ARCH="${BUILD_ARCH:-all}" -ALLOW_RUNTIME_APT_FIX="${ALLOW_RUNTIME_APT_FIX:-0}" +ALLOW_RUNTIME_APT_FIX="${ALLOW_RUNTIME_APT_FIX:-1}" CARGO_REGISTRY_MIRROR="${CARGO_REGISTRY_MIRROR:-https://rsproxy.cn/index/}" CARGO_NET_RETRY="${CARGO_NET_RETRY:-8}" CARGO_HTTP_TIMEOUT="${CARGO_HTTP_TIMEOUT:-120}" diff --git a/scripts/docker/run-build.sh b/scripts/docker/run-build.sh index 6b64376..c130287 100644 --- a/scripts/docker/run-build.sh +++ b/scripts/docker/run-build.sh @@ -17,6 +17,7 @@ CARGO_REGISTRY_MIRROR="${CARGO_REGISTRY_MIRROR:-https://rsproxy.cn/index/}" CARGO_NET_RETRY="${CARGO_NET_RETRY:-8}" CARGO_HTTP_TIMEOUT="${CARGO_HTTP_TIMEOUT:-120}" CARGO_HTTP_MULTIPLEXING="${CARGO_HTTP_MULTIPLEXING:-false}" +ALLOW_RUNTIME_APT_FIX="${ALLOW_RUNTIME_APT_FIX:-1}" PROJECT_ARGS=() while (($# > 0)); do @@ -50,6 +51,7 @@ while (($# > 0)); do CARGO_NET_RETRY= Cargo 网络重试次数(默认 8) CARGO_HTTP_TIMEOUT= Cargo 单请求超时秒数(默认 120) CARGO_HTTP_MULTIPLEXING=true/false Cargo HTTP/2 复用(默认 false) + ALLOW_RUNTIME_APT_FIX=1/0 运行时缺依赖时是否允许 apt 联网补齐(默认 1) EOF exit 0 ;; @@ -129,7 +131,7 @@ if [[ "$RUN_MODE" == "docker" ]]; then -e CARGO_NET_RETRY="$CARGO_NET_RETRY" \ -e CARGO_HTTP_TIMEOUT="$CARGO_HTTP_TIMEOUT" \ -e CARGO_HTTP_MULTIPLEXING="$CARGO_HTTP_MULTIPLEXING" \ - -e ALLOW_RUNTIME_APT_FIX="${ALLOW_RUNTIME_APT_FIX:-0}" \ + -e ALLOW_RUNTIME_APT_FIX="$ALLOW_RUNTIME_APT_FIX" \ "$IMAGE_TAG" \ bash /work/scripts/docker/container-entry.sh "${SELECTED_PROJECTS[@]}" @@ -147,7 +149,7 @@ if [[ "$RUN_MODE" == "docker" ]]; then -e CARGO_NET_RETRY="$CARGO_NET_RETRY" \ -e CARGO_HTTP_TIMEOUT="$CARGO_HTTP_TIMEOUT" \ -e CARGO_HTTP_MULTIPLEXING="$CARGO_HTTP_MULTIPLEXING" \ - -e ALLOW_RUNTIME_APT_FIX="${ALLOW_RUNTIME_APT_FIX:-0}" \ + -e ALLOW_RUNTIME_APT_FIX="$ALLOW_RUNTIME_APT_FIX" \ "$IMAGE_TAG" \ bash /work/scripts/docker/container-entry.sh "${SELECTED_PROJECTS[@]}" else @@ -165,7 +167,7 @@ else -e CARGO_NET_RETRY="$CARGO_NET_RETRY" \ -e CARGO_HTTP_TIMEOUT="$CARGO_HTTP_TIMEOUT" \ -e CARGO_HTTP_MULTIPLEXING="$CARGO_HTTP_MULTIPLEXING" \ - -e ALLOW_RUNTIME_APT_FIX="${ALLOW_RUNTIME_APT_FIX:-0}" \ + -e ALLOW_RUNTIME_APT_FIX="$ALLOW_RUNTIME_APT_FIX" \ "$IMAGE_TAG" \ bash /work/scripts/docker/container-entry.sh "${SELECTED_PROJECTS[@]}" fi