diff --git a/environment.sh b/environment.sh index df2907d..fa3c804 100644 --- a/environment.sh +++ b/environment.sh @@ -124,7 +124,7 @@ export CONSUL_MEMORY="512m" export XXLJOB_NAME=XXL_JOB_${DOMAIN} export XXLJOB_IMAGE=${REGISTRY_HOST}xuxueli/xxl-job-admin:2.4.0 export XXLJOB_PORT=8282 -export XXLJOB_MEMORY=512m +export XXLJOB_MEMORY=1g export XXLJOB_ACCESS_TOKEN=default_token #SKY_AOP 配置 diff --git a/nginx/Dockerfile.nginx b/nginx/Dockerfile.nginx index f9aef7f..fd1c530 100644 --- a/nginx/Dockerfile.nginx +++ b/nginx/Dockerfile.nginx @@ -5,6 +5,7 @@ RUN rm -rf /etc/nginx/conf.d/* # 创建目标目录 RUN mkdir -p /data/tuoheng_airport_web/dist +RUN mkdir -p /data/tuoheng_hhz_web/dist # 创建视频录制和图片的地址 RUN mkdir -p /data/recording diff --git a/nginx/build_image.sh b/nginx/build_image.sh index 9d54c59..e5881db 100755 --- a/nginx/build_image.sh +++ b/nginx/build_image.sh @@ -40,6 +40,11 @@ if [ ! -d "${AIRPORT_WEB_DIST}" ]; then exit 1 fi +if [ ! -d "${HHZ_ADMIN_WEB_DIST}" ]; then + echo "错误: HHZ_ADMIN_WEB_DIST 目录不存在: ${HHZ_ADMIN_WEB_DIST}" + exit 1 +fi + # 创建临时目录用于复制文件 echo "创建临时目录并复制 AIRPORT_WEB_DIST 文件..." rm -rf airport_web_dist @@ -56,6 +61,7 @@ docker build -t ${NGINX_IMAGE} -f Dockerfile.nginx . # 清理临时目录 rm -rf airport_web_dist +rm -rf hhz_admin_web_dist # 检查构建结果 if [ $? -eq 0 ]; then