From f9d7a55d7adddf96db40dfe855892a4295f38cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Thu, 29 May 2025 20:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dashuju.sh     |  4 ++++
 environment.sh |  2 +-
 start/nginx.sh | 38 ++++++++++++++++++++++++++++++++------
 说明.md      |  2 ++
 4 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/dashuju.sh b/dashuju.sh
index ea15e34..3cf2fa0 100755
--- a/dashuju.sh
+++ b/dashuju.sh
@@ -40,6 +40,10 @@ echo $DSP_ADMIN_WEB_DIST
 echo $AIRPORT_WEB_DIST
 echo $BUSINESS_WEB_DIST
 
+#域名证书位置写在这边
+#export PEM_PATH=/Users/sunpeng/workspace/remote/docker/nginx/vhosts/cert/t-aaron.com.pem
+#export KEY_PATH=/Users/sunpeng/workspace/remote/docker/nginx/vhosts/cert/t-aaron.com.key
+
 #前端配置
 #export VUE_APP_API_BASE_URL = https://${HHZ_DOMAIN}:${NGINX_HTTPS_PORT}/
 #export VUE_APP_AUTHORITY = https://${OIDC_SERVER_DOMAIN}:${NGINX_HTTPS_PORT}
diff --git a/environment.sh b/environment.sh
index 3131b9d..98ae6cb 100644
--- a/environment.sh
+++ b/environment.sh
@@ -239,7 +239,7 @@ export SKY_AOP=106.15.229.178:11800
 
 #OIDCServer 配置
 export OIDC_SERVER_NAME=OIDC-SERVER${DOMAIN} 
-export OIDC_SERVER_IMAGE=${REGISTRY_HOST}oidcserver:${DOMAIN} 
+export OIDC_SERVER_IMAGE=${REGISTRY_HOST}oidcserver:${DOMAIN}${VERSION} 
 export OIDC_SERVER_JAR=tuoheng_oidc_server.jar
 if [ -z "$OIDC_SERVER_REMOTE_JAR" ]; then
    export OIDC_SERVER_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/oidcservice/${OIDC_SERVER_JAR}
diff --git a/start/nginx.sh b/start/nginx.sh
index 3bd44c5..73c39c0 100755
--- a/start/nginx.sh
+++ b/start/nginx.sh
@@ -8,8 +8,8 @@ if docker ps -a | grep -q ${NGINX_NAME}; then
     docker rm ${NGINX_NAME} >/dev/null 2>&1
 fi
 
-# 启动Nginx容器
-docker run --pull always -d \
+# 准备 docker run 命令
+DOCKER_RUN_CMD="docker run --pull always -d \
 --name ${NGINX_NAME} \
 --network ${NETWORK} \
 -p ${NGINX_HTTP_PORT}:80 \
@@ -18,8 +18,34 @@ docker run --pull always -d \
 --memory ${NGINX_MEMORY} \
 --volume ${STREAM_DATA}:/data/recording \
 --volume ${SRS_DATA}:/data/srs \
---restart unless-stopped \
-${NGINX_IMAGE}
+--restart unless-stopped"
 
-# 显示运行中的容器
-docker ps 
\ No newline at end of file
+# 如果配置了证书，添加证书挂载
+if [ ! -z "${PEM_PATH}" ] && [ ! -z "${KEY_PATH}" ]; then
+    echo "检测到证书配置，将挂载证书文件..."
+    if [ ! -f "${PEM_PATH}" ] || [ ! -f "${KEY_PATH}" ]; then
+        echo "错误：证书文件不存在！"
+        exit 1
+    fi
+    DOCKER_RUN_CMD="${DOCKER_RUN_CMD} \
+--volume ${PEM_PATH}:/etc/nginx/t-aaron.com.pem \
+--volume ${KEY_PATH}:/etc/nginx/t-aaron.com.key"
+fi
+
+# 添加镜像名称并运行容器
+DOCKER_RUN_CMD="${DOCKER_RUN_CMD} ${NGINX_IMAGE}"
+
+# 执行 docker run 命令
+echo "启动 Nginx 容器..."
+eval ${DOCKER_RUN_CMD}
+
+# 检查容器是否成功启动
+if [ $? -eq 0 ]; then
+    echo "Nginx 容器启动成功！"
+    docker ps | grep ${NGINX_NAME}
+else
+    echo "错误：Nginx 容器启动失败！"
+    exit 1
+fi
+
+ 
\ No newline at end of file
diff --git a/说明.md b/说明.md
index 8360323..3913c68 100644
--- a/说明.md
+++ b/说明.md
@@ -14,6 +14,8 @@ nginx的vhosts里面的cert文件需要更新为域名的配置文件
 2: 刷Kafka数据
    
 3: 建minio的权限
+
+4: 将环境变量拷贝到 nginx/vhosts/cert 目录下？
    
 ～～～～～～～～～～～～～～～～～～～～～～
 构建镜像 （在tuoheng的服务器上构建）