瀏覽代碼

Merge branch 'feature/consolelog' of duanxiaoduan/tmr-group-admin into release/v1.0.2

xuyiping 1 年之前
父節點
當前提交
77c62ef4c0
共有 2 個文件被更改,包括 5 次插入11 次删除
  1. 1 1
      Dockerfile
  2. 4 10
      default.conf.template

+ 1 - 1
Dockerfile

@@ -13,7 +13,7 @@ RUN npm run build:prod
 FROM nginx:alpine
 
 COPY --from=builder /app/tmr-group-admin/dist/ /usr/share/nginx/html/
-COPY --from=builder /app/tmr-group-admin/default.conf.template /etc/nginx/templates/default.conf.template
+COPY --from=builder /app/tmr-admin/default.conf.template /etc/nginx/conf.d/default.conf
 EXPOSE 80
 
 CMD ["/bin/sh", "-c", "sed -i \"s@<html@<html domain=\"$DOMAIN\"@\" /usr/share/nginx/html/index.html; nginx -g \"daemon off;\""]

+ 4 - 10
default.conf.template

@@ -3,22 +3,17 @@ server {
    listen  [::]:80;
    server_name  localhost;
 
-   access_log  /var/log/nginx/host.access.log  main;
-
    gzip on;
-   gzip_disable "msie6";
-   gzip_vary on;
-   gzip_proxied any;
+   gzip_static on;
    gzip_comp_level 6;
-   gzip_buffers 16 8k;
-   gzip_http_version 1.1;
-   gzip_types text/plain application/css text/css application/xml text/javascript application/javascript application/x-javascript;
-
+   gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
    location / {
         root /usr/share/nginx/html;
         #index index.html;
         try_files $uri $uri/ /index.html;
+        client_max_body_size 300m;   #最大接受300m文件以内的
+        client_body_timeout 20s;
    }
    #error_page  404              /404.html;
 
@@ -28,5 +23,4 @@ server {
    location = /50x.html {
       root   /usr/share/nginx/html;
    }
-
 }