diff --git a/environment.sh b/environment.sh index f3ba545..220ddbd 100644 --- a/environment.sh +++ b/environment.sh @@ -173,7 +173,7 @@ export HHZ_ADMIN_JAR=tuoheng_hhz_admin.jar export HHZ_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/hhz-admin/${HHZ_ADMIN_JAR} export HHZ_ADMIN_MEMORY=1g if [ -z "${HHZ_ADMIN_WEB_DIST}" ]; then - export HHZ_ADMIN_WEB_DIST=/Users/sunpeng/workspace/empty + export HHZ_ADMIN_WEB_DIST=/Users/sunpeng/workspace/remote/tuoheng_hhz_web/dist echo "环境变量 HHZ_ADMIN_WEB_DIST 未设置,设置为默认值 ${HHZ_ADMIN_WEB_DIST}" fi diff --git a/nginx/Dockerfile.nginx b/nginx/Dockerfile.nginx index 8fd0ef8..f9aef7f 100644 --- a/nginx/Dockerfile.nginx +++ b/nginx/Dockerfile.nginx @@ -19,6 +19,7 @@ COPY vhosts/cert/t-aaron.com.key /etc/nginx/t-aaron.com.key # 复制 AIRPORT_WEB_DIST 目录下的文件到容器中 COPY airport_web_dist/ /data/tuoheng_airport_web/dist/ +COPY hhz_admin_web_dist/ /data/tuoheng_hhz_web/dist/ # 设置正确的权限 RUN chmod 644 /etc/nginx/t-aaron.com.pem /etc/nginx/t-aaron.com.key && \ diff --git a/nginx/build_image.sh b/nginx/build_image.sh index 15fa8de..9d54c59 100755 --- a/nginx/build_image.sh +++ b/nginx/build_image.sh @@ -46,6 +46,10 @@ rm -rf airport_web_dist mkdir -p airport_web_dist cp -r "${AIRPORT_WEB_DIST}"/* airport_web_dist/ +rm -rf hhz_admin_web_dist +mkdir -p hhz_admin_web_dist +cp -r "${HHZ_ADMIN_WEB_DIST}"/* hhz_admin_web_dist/ + # 构建Docker镜像 echo "使用Dockerfile.nginx构建镜像..." docker build -t ${NGINX_IMAGE} -f Dockerfile.nginx .