From 51d4d83cbfda4f1c9c6865d3d5e0af92b4f80742 Mon Sep 17 00:00:00 2001 From: liu Date: Fri, 19 Jan 2024 13:07:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9nginx=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=BA=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/nginx/Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 5029ac3c..ab2cad2e 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -2,21 +2,18 @@ FROM nginx:1.25 # 覆盖原镜像的启动脚本 -COPY ./docs/docker-entrypoint.sh /docker-entrypoint.sh +COPY /data/vp/docs/docker-entrypoint.sh /docker-entrypoint.sh # 删除默认的配置文件 RUN rm /etc/nginx/conf.d/default.conf # 复制配置文件信息 -COPY ./docs/conf.d/http.conf ./docs/conf.d/https.conf /etc/nginx/conf.d/ -COPY ./docs/conf.d/nginx.conf /etc/nginx/nginx.conf -COPY ./docs/conf.d/servers.conf.template /data/vp/nginx/conf/servers.conf.template +COPY /data/vp/docs/conf.d/http.conf ./docs/conf.d/https.conf /etc/nginx/conf.d/ +COPY /data/vp/docs/conf.d/nginx.conf /etc/nginx/nginx.conf +COPY /data/vp/docs/conf.d/servers.conf.template /data/vp/nginx/conf/servers.conf.template # 复制ssl证书信息 -COPY ./docs/ssl /data/vp/nginx/ssl - -# 复制静态文件信息 -COPY ./html /usr/share/nginx/html +COPY /data/vp/docs/ssl /data/vp/nginx/ssl # 暴漏服务端口 EXPOSE 80 443 From 83d596a036cf358538e7a4577a430f2a2deb06fc Mon Sep 17 00:00:00 2001 From: liu Date: Fri, 19 Jan 2024 13:09:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9nginx=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=BA=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/nginx/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index ab2cad2e..723a7729 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -2,18 +2,18 @@ FROM nginx:1.25 # 覆盖原镜像的启动脚本 -COPY /data/vp/docs/docker-entrypoint.sh /docker-entrypoint.sh +COPY ./docs/docker-entrypoint.sh /docker-entrypoint.sh # 删除默认的配置文件 RUN rm /etc/nginx/conf.d/default.conf # 复制配置文件信息 -COPY /data/vp/docs/conf.d/http.conf ./docs/conf.d/https.conf /etc/nginx/conf.d/ -COPY /data/vp/docs/conf.d/nginx.conf /etc/nginx/nginx.conf -COPY /data/vp/docs/conf.d/servers.conf.template /data/vp/nginx/conf/servers.conf.template +COPY ./docs/conf.d/http.conf ./docs/conf.d/https.conf /etc/nginx/conf.d/ +COPY ./docs/conf.d/nginx.conf /etc/nginx/nginx.conf +COPY ./docs/conf.d/servers.conf.template /data/vp/nginx/conf/servers.conf.template # 复制ssl证书信息 -COPY /data/vp/docs/ssl /data/vp/nginx/ssl +COPY ./docs/ssl /data/vp/nginx/ssl # 暴漏服务端口 EXPOSE 80 443