Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

0f8027f1 · 林家欣 · 84694e72 · 1be1155f · 0f8027f1 · 0f8027f1
Commit 0f8027f1 authored Nov 30, 2021 by 林家欣
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Dockerfile Dockerfile +2 -2

nginx.conf nginx.conf +1 -1

No files found.
--- a/Dockerfile
+++ b/Dockerfile
 FROM nginx

-RUN rm -rf /usr/share/nginx/html/*
+#RUN rm -rf /usr/share/nginx/html/*
 RUN rm -rf /etc/nginx/conf.d/*

-COPY dist /usr/share/nginx/html
+#COPY dist /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/conf.d/

 COPY docker-entrypoint.sh /usr/local/bin/

--- a/nginx.conf
+++ b/nginx.conf
@@ -12,7 +12,7 @@ gzip_vary on;
 gzip_disable "MSIE [1-6]\.";

 server {
-        listen 9091;
+        listen 8080;
        server_name  81.68.189.225;
        location / {
            root   /usr/share/nginx/html;