diff --git a/nginx/Dockerfile.nginx b/nginx/Dockerfile.nginx index 871c655..3f762df 100644 --- a/nginx/Dockerfile.nginx +++ b/nginx/Dockerfile.nginx @@ -3,6 +3,9 @@ FROM nginx:latest # 删除默认的nginx配置 RUN rm -rf /etc/nginx/conf.d/* +# 创建目标目录 +RUN mkdir -p /data/tuoheng_airport_web/dist + # 复制temp_vhosts配置到nginx配置目录 COPY temp_vhosts/ /etc/nginx/conf.d/ @@ -10,8 +13,12 @@ COPY temp_vhosts/ /etc/nginx/conf.d/ COPY vhosts/cert/t-aaron.com.pem /etc/nginx/t-aaron.com.pem 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/ + # 设置正确的权限 -RUN chmod 644 /etc/nginx/t-aaron.com.pem /etc/nginx/t-aaron.com.key +RUN chmod 644 /etc/nginx/t-aaron.com.pem /etc/nginx/t-aaron.com.key && \ + chmod -R 755 /data/tuoheng_airport_web/dist # 设置时区 ENV TZ=Asia/Shanghai diff --git a/nginx/build_image.sh b/nginx/build_image.sh index d4063b5..15fa8de 100755 --- a/nginx/build_image.sh +++ b/nginx/build_image.sh @@ -29,10 +29,30 @@ if [ ! -f "vhosts/cert/t-aaron.com.pem" ] || [ ! -f "vhosts/cert/t-aaron.com.key echo "Nginx容器的SSL功能可能无法正常工作" fi +# 检查 AIRPORT_WEB_DIST 目录是否存在 +if [ -z "${AIRPORT_WEB_DIST}" ]; then + echo "错误: AIRPORT_WEB_DIST 环境变量未设置!" + exit 1 +fi + +if [ ! -d "${AIRPORT_WEB_DIST}" ]; then + echo "错误: AIRPORT_WEB_DIST 目录不存在: ${AIRPORT_WEB_DIST}" + exit 1 +fi + +# 创建临时目录用于复制文件 +echo "创建临时目录并复制 AIRPORT_WEB_DIST 文件..." +rm -rf airport_web_dist +mkdir -p airport_web_dist +cp -r "${AIRPORT_WEB_DIST}"/* airport_web_dist/ + # 构建Docker镜像 echo "使用Dockerfile.nginx构建镜像..." docker build -t ${NGINX_IMAGE} -f Dockerfile.nginx . +# 清理临时目录 +rm -rf airport_web_dist + # 检查构建结果 if [ $? -eq 0 ]; then echo "Nginx镜像构建成功: ${NGINX_IMAGE}" @@ -52,4 +72,5 @@ else fi echo "Nginx镜像构建和推送完成!" -echo "SSL证书已被包含在镜像中,位于/etc/nginx/目录下" \ No newline at end of file +echo "SSL证书已被包含在镜像中,位于/etc/nginx/目录下" +echo "AIRPORT_WEB_DIST 文件已被复制到镜像中的 /data/tuoheng_airport_web/dist 目录" \ No newline at end of file