sunpeng
/
docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加版本的控制

This commit is contained in:
孙小云 2025-05-26 09:42:53 +08:00
parent cc0efb2cb7
commit 7d04804799
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
environment.sh
View File

@ -38,22 +38,6 @@ else
echo "环境变量 DOMAIN_END 已设置，设置为 ${DOMAIN_END}" echo "环境变量 DOMAIN_END 已设置，设置为 ${DOMAIN_END}"
fi fi
export SKYWALKING_UI_DOMAIN=sky-${DOMAIN}.${DOMAIN_END}
export CONSUL_DOMAIN=consul-${DOMAIN}.${DOMAIN_END}
export XXLJOB_DOMAIN=xxljob-${DOMAIN}.${DOMAIN_END}
export OIDC_SERVER_DOMAIN=oidc-${DOMAIN}.${DOMAIN_END}
export MINIO_DOMAIN=minio-${DOMAIN}.${DOMAIN_END}
export MINIO_CONSOLE_DOMAIN=minioconsole-${DOMAIN}.${DOMAIN_END}
export AIRPORT_DOMAIN=airport-${DOMAIN}.${DOMAIN_END}
export SRS_DOMAIN=srs-${DOMAIN}.${DOMAIN_END}
export HHZ_DOMAIN=hhz-${DOMAIN}.${DOMAIN_END}
export DSP_DOMAIN=dsp-${DOMAIN}.${DOMAIN_END}
export REGISTRY_HOST=${REGISTRY}/tuoheng/
#Nginx 配置
export NGINX_NAME=NGINX_${DOMAIN}
export NGINX_IMAGE=${REGISTRY_HOST}nginx:${DOMAIN}${VERSION}
# 主机对外爆露的HTTP端口 # 主机对外爆露的HTTP端口
if [ -z "$NGINX_HTTP_PORT" ]; then if [ -z "$NGINX_HTTP_PORT" ]; then
export NGINX_HTTP_PORT=8899 export NGINX_HTTP_PORT=8899
@ -66,6 +50,24 @@ if [ -z "$NGINX_HTTPS_PORT" ]; then
else else
echo "环境变量 NGINX_HTTPS_PORT 已设置，设置为 ${NGINX_HTTPS_PORT}" echo "环境变量 NGINX_HTTPS_PORT 已设置，设置为 ${NGINX_HTTPS_PORT}"
fi fi
export SKYWALKING_UI_DOMAIN=sky-${DOMAIN}.${DOMAIN_END}
export CONSUL_DOMAIN=consul-${DOMAIN}.${DOMAIN_END}
export XXLJOB_DOMAIN=xxljob-${DOMAIN}.${DOMAIN_END}
export OIDC_SERVER_DOMAIN=oidc-${DOMAIN}.${DOMAIN_END}
export OIDC_DOMAIN_FULL=${OIDC_SERVER_DOMAIN}:${NGINX_HTTPS_PORT}
export MINIO_DOMAIN=minio-${DOMAIN}.${DOMAIN_END}
export MINIO_CONSOLE_DOMAIN=minioconsole-${DOMAIN}.${DOMAIN_END}
export AIRPORT_DOMAIN=airport-${DOMAIN}.${DOMAIN_END}
export SRS_DOMAIN=srs-${DOMAIN}.${DOMAIN_END}
export HHZ_DOMAIN=hhz-${DOMAIN}.${DOMAIN_END}
export DSP_DOMAIN=dsp-${DOMAIN}.${DOMAIN_END}
export REGISTRY_HOST=${REGISTRY}/tuoheng/
#Nginx 配置
export NGINX_NAME=NGINX_${DOMAIN}
export NGINX_IMAGE=${REGISTRY_HOST}nginx:${DOMAIN}${VERSION}
export NGINX_MEMORY=256m export NGINX_MEMORY=256m
#MySql 配置 #MySql 配置

1
nginx/replace_vars.sh
View File

@ -50,6 +50,7 @@ for conf_file in vhosts/*.conf; do
if [ ! -z "$var_value" ]; then if [ ! -z "$var_value" ]; then
# 使用更安全的变量替换方法 # 使用更安全的变量替换方法
pattern="\\\${$var_name}" pattern="\\\${$var_name}"
# 转义特殊字符 # 转义特殊字符
escaped_value=$(echo "$var_value" | sed 's/[\/&]/\\&/g') escaped_value=$(echo "$var_value" | sed 's/[\/&]/\\&/g')
echo " 替换变量: ${pattern} -> $var_value" echo " 替换变量: ${pattern} -> $var_value"

2
nginx/vhosts/oidcservice.conf
View File

@ -19,6 +19,6 @@ server {
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
# 只添加这一行来修复重定向 # 只添加这一行来修复重定向
proxy_redirect http://${OIDC_SERVER_DOMAIN} https://${OIDC_SERVER_DOMAIN}:${NGINX_HTTPS_PORT}; proxy_redirect http://${OIDC_SERVER_DOMAIN} https://${OIDC_DOMAIN_FULL};
} }
} }