From d6fc625dbe7917a94f905fc50271b0e5c2b997f1 Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 10:52:53 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0nginx=E8=BD=AC=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index b37da17d..4498ebd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,15 +3,26 @@ MAINTAINER lfzxs@qq.com VOLUME /tmp ENV LANG en_US.UTF-8 RUN echo "server { \ - location / { \ - root /var/www/html/; \ - index index.html index.htm; \ - if (!-e \$request_filename) { \ + listen 9988;\ + server_name localhost;\ + location /prod-api/{\ + proxy_read_timeout 600s;\ + proxy_http_version 1.1;\ + proxy_set_header Upgrade $http_upgrade;\ + proxy_set_header Connection "upgrade";\ + proxy_set_header Host $host;\ + proxy_set_header X-Real-Ip $remote_addr;\ + proxy_pass http://192.168.10.241:30646/;\ + }\ + location / { \ + root /var/www/html/; \ + index index.html index.htm; \ + if (!-e \$request_filename) { \ rewrite ^(.*)\$ /index.html?s=\$1 last; \ break; \ - } \ - } \ - access_log /var/log/nginx/access.log ; \ + } \ + } \ + access_log /var/log/nginx/access.log ; \ } " > /etc/nginx/conf.d/default.conf \ && mkdir -p /var/www \ && mkdir -p /var/www/html From d3f928df8559179ad6c2595e44fcd887153e5277 Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 11:23:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4498ebd8..22723dd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,13 +6,13 @@ RUN echo "server { \ listen 9988;\ server_name localhost;\ location /prod-api/{\ - proxy_read_timeout 600s;\ - proxy_http_version 1.1;\ - proxy_set_header Upgrade $http_upgrade;\ - proxy_set_header Connection "upgrade";\ - proxy_set_header Host $host;\ - proxy_set_header X-Real-Ip $remote_addr;\ proxy_pass http://192.168.10.241:30646/;\ + proxy_set_header Host $host;\ + proxy_set_header X-Real-IP $remote_addr;\ + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\ + proxy_set_header X-Forwarded-Host $http_host;\ + proxy_set_header X-Forwarded-Port $server_port;\ + proxy_set_header X-Forwarded-Proto $scheme;\ }\ location / { \ root /var/www/html/; \ From f866ed4185268bde99149c3faaf54e64f394f3c1 Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 11:41:48 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 22723dd1..3c343f57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,16 @@ MAINTAINER lfzxs@qq.com VOLUME /tmp ENV LANG en_US.UTF-8 RUN echo "server { \ - listen 9988;\ - server_name localhost;\ - location /prod-api/{\ - proxy_pass http://192.168.10.241:30646/;\ - proxy_set_header Host $host;\ - proxy_set_header X-Real-IP $remote_addr;\ - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\ - proxy_set_header X-Forwarded-Host $http_host;\ - proxy_set_header X-Forwarded-Port $server_port;\ - proxy_set_header X-Forwarded-Proto $scheme;\ + listen 9988; \ + server_name localhost; \ + location /prod-api/{ \ + proxy_pass http://192.168.10.241:30646/; \ + proxy_set_header Host $host; \ + proxy_set_header X-Real-IP $remote_addr; \ + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; \ + proxy_set_header X-Forwarded-Host $http_host; \ + proxy_set_header X-Forwarded-Port $server_port; \ + proxy_set_header X-Forwarded-Proto $scheme; \ }\ location / { \ root /var/www/html/; \ @@ -25,8 +25,8 @@ RUN echo "server { \ access_log /var/log/nginx/access.log ; \ } " > /etc/nginx/conf.d/default.conf \ && mkdir -p /var/www \ - && mkdir -p /var/www/html - + && mkdir -p /var/www/html \ + CAT /etc/nginx/conf.d/default.conf ADD dist/ /var/www/html/ EXPOSE 80 EXPOSE 443 \ No newline at end of file From 4f4af157e6f75bbaab79de056d64a5bdc121867a Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 11:48:43 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c343f57..2fd6f06f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN echo "server { \ } " > /etc/nginx/conf.d/default.conf \ && mkdir -p /var/www \ && mkdir -p /var/www/html \ - CAT /etc/nginx/conf.d/default.conf + && CAT /etc/nginx/conf.d/default.conf ADD dist/ /var/www/html/ EXPOSE 80 EXPOSE 443 \ No newline at end of file From e189a53aef578e9611f21d7e021681feac2f3219 Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 11:57:56 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2fd6f06f..e15cfe8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN echo "server { \ } " > /etc/nginx/conf.d/default.conf \ && mkdir -p /var/www \ && mkdir -p /var/www/html \ - && CAT /etc/nginx/conf.d/default.conf + && cat /etc/nginx/conf.d/default.conf ADD dist/ /var/www/html/ EXPOSE 80 EXPOSE 443 \ No newline at end of file From 2617a47307f9a28571e50b82605000a1bdfabf21 Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 13:46:47 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e15cfe8c..1a7878aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,11 @@ ENV LANG en_US.UTF-8 RUN echo "server { \ listen 9988; \ server_name localhost; \ - location /prod-api/{ \ + location /prod-api/ { \ proxy_pass http://192.168.10.241:30646/; \ - proxy_set_header Host $host; \ + proxy_set_header Host 192.168.10.241:30646; \ proxy_set_header X-Real-IP $remote_addr; \ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; \ - proxy_set_header X-Forwarded-Host $http_host; \ - proxy_set_header X-Forwarded-Port $server_port; \ - proxy_set_header X-Forwarded-Proto $scheme; \ }\ location / { \ root /var/www/html/; \ From 27a13e9eaa45fbdc3eeee87b64f5fbdf31b8fe4a Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 13:54:23 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9host?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1a7878aa..18d70f6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN echo "server { \ server_name localhost; \ location /prod-api/ { \ proxy_pass http://192.168.10.241:30646/; \ - proxy_set_header Host 192.168.10.241:30646; \ + proxy_set_header Host 192.168.10.241; \ proxy_set_header X-Real-IP $remote_addr; \ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; \ }\ From 31894f3e2fd9ce6d5da89f6be5b0b4ad1a6ab73f Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 14:17:57 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 18d70f6e..822514b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ RUN echo "server { \ location /prod-api/ { \ proxy_pass http://192.168.10.241:30646/; \ proxy_set_header Host 192.168.10.241; \ - proxy_set_header X-Real-IP $remote_addr; \ - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; \ + proxy_set_header X-Real-IP \$remote_addr; \ + proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; \ }\ location / { \ root /var/www/html/; \ From f44a7a6aee637d21becd6574cc917b0620d8f41d Mon Sep 17 00:00:00 2001 From: 0000792 <1161664478@qq.com> Date: Tue, 20 Sep 2022 15:09:24 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 822514b7..01029c09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ MAINTAINER lfzxs@qq.com VOLUME /tmp ENV LANG en_US.UTF-8 RUN echo "server { \ - listen 9988; \ server_name localhost; \ location /prod-api/ { \ proxy_pass http://192.168.10.241:30646/; \ @@ -22,8 +21,7 @@ RUN echo "server { \ access_log /var/log/nginx/access.log ; \ } " > /etc/nginx/conf.d/default.conf \ && mkdir -p /var/www \ - && mkdir -p /var/www/html \ - && cat /etc/nginx/conf.d/default.conf + && mkdir -p /var/www/html ADD dist/ /var/www/html/ EXPOSE 80 EXPOSE 443 \ No newline at end of file