GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-06-28 11:12:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add NO_PROXY defaults to Docker proxy setup

Browse Source
This commit is contained in:
jxxghp
2026-06-23 20:22:40 +08:00
parent c1d8676b25
commit 109be58abe
4 changed files with 162 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
docker/entrypoint.sh
View File

@@ -35,12 +35,43 @@ function apply_package_cache_env() {
mkdir -p "${PIP_CACHE_DIR}" "${UV_CACHE_DIR}"
}
function apply_no_proxy_env() {
local default_no_proxy="localhost,127.0.0.1,::1,0.0.0.0,10.0.0.0/8,100.64.0.0/10,169.254.0.0/16,172.16.0.0/12,192.168.0.0/16,fc00::/7,fe80::/10,host.docker.internal,host.containers.internal,gateway.docker.internal,.local,.lan,.internal,.home.arpa,.localdomain"
local merged="${NO_PROXY:-}"
local source_value item old_ifs
local -a no_proxy_items
# Docker 内常见本机、局域网和内网服务必须直连，避免 PROXY_HOST 被映射到
# HTTP_PROXY 后拦截 Telegram 回调、下载器、媒体服务器等本地请求。
for source_value in "${no_proxy:-}" "${default_no_proxy}"; do
old_ifs="${IFS}"
IFS=','
read -ra no_proxy_items <<< "${source_value}"
IFS="${old_ifs}"
for item in "${no_proxy_items[@]}"; do
item="${item#"${item%%[![:space:]]*}"}"
item="${item%"${item##*[![:space:]]}"}"
if [ -z "${item}" ]; then
continue
fi
case ",${merged}," in
*",${item},"*) ;;
*) merged="${merged:+${merged},}${item}" ;;
esac
done
done
export NO_PROXY="${merged}"
export no_proxy="${merged}"
}
function apply_package_proxy_env() {
if [ -n "${PROXY_HOST}" ]; then
if [ -n "${PROXY_HOST:-}" ]; then
export HTTP_PROXY="${PROXY_HOST}"
export HTTPS_PROXY="${PROXY_HOST}"
export http_proxy="${PROXY_HOST}"
export https_proxy="${PROXY_HOST}"
apply_no_proxy_env
fi
}
@@ -167,6 +198,9 @@ function load_config_from_app_env() {
done
shopt -u extglob
if [ -n "${PROXY_HOST:-}${HTTP_PROXY:-}${HTTPS_PROXY:-}${http_proxy:-}${https_proxy:-}" ]; then
apply_no_proxy_env
fi
INFO "配置加载流程执行完毕。"
}

32
docker/update.sh
View File

@@ -36,12 +36,42 @@ function apply_package_cache_env() {
apply_package_cache_env
function apply_no_proxy_env() {
local default_no_proxy="localhost,127.0.0.1,::1,0.0.0.0,10.0.0.0/8,100.64.0.0/10,169.254.0.0/16,172.16.0.0/12,192.168.0.0/16,fc00::/7,fe80::/10,host.docker.internal,host.containers.internal,gateway.docker.internal,.local,.lan,.internal,.home.arpa,.localdomain"
local merged="${NO_PROXY:-}"
local source_value item old_ifs
local -a no_proxy_items
# 代理仅用于外网依赖下载，容器访问本机、局域网和内网服务时应保持直连。
for source_value in "${no_proxy:-}" "${default_no_proxy}"; do
old_ifs="${IFS}"
IFS=','
read -ra no_proxy_items <<< "${source_value}"
IFS="${old_ifs}"
for item in "${no_proxy_items[@]}"; do
item="${item#"${item%%[![:space:]]*}"}"
item="${item%"${item##*[![:space:]]}"}"
if [[ -z "${item}" ]]; then
continue
fi
case ",${merged}," in
*",${item},"*) ;;
*) merged="${merged:+${merged},}${item}" ;;
esac
done
done
export NO_PROXY="${merged}"
export no_proxy="${merged}"
}
function apply_package_proxy_env() {
if [[ -n "${PROXY_HOST}" ]]; then
if [[ -n "${PROXY_HOST:-}" ]]; then
export HTTP_PROXY="${PROXY_HOST}"
export HTTPS_PROXY="${PROXY_HOST}"
export http_proxy="${PROXY_HOST}"
export https_proxy="${PROXY_HOST}"
apply_no_proxy_env
fi
}