神仙都没用 1 vuosi sitten
vanhempi
sitoutus
ff1531fa88
2 muutettua tiedostoa jossa 16 lisäystä ja 67 poistoa
  1. 2 4
      Dockerfile
  2. 14 63
      nginx.conf

+ 2 - 4
Dockerfile

@@ -1,11 +1,9 @@
 FROM node:lts-alpine
 WORKDIR /build
-# 设置Node-Sass的镜像地址
-RUN npm config set sass_binary_site=https://npm.taobao.org/mirrors/node-sass/
 # 设置npm镜像
-RUN npm config set registry https://registry.npm.taobao.org
+RUN npm config set registry https://registry.npmmirror.com
 COPY package.json /build/package.json
-RUN yarn
+RUN npm install
 COPY ./ /build
 RUN npm run build
 

+ 14 - 63
nginx.conf

@@ -14,7 +14,7 @@ http {
   access_log  /var/log/nginx/access.log  main;
   sendfile        on;
   keepalive_timeout  65;
-  upstream backend {
+  upstream cool {
       server midway:8001;
   }
 
@@ -28,7 +28,7 @@ http {
     }
     location /api/ 
     {
-        proxy_pass http://backend/;
+        proxy_pass http://cool/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -51,73 +51,24 @@ http {
 
         #expires 12h;
     }
-#  location /im {  
-#         proxy_pass http://backend/im;   
-#         proxy_connect_timeout 3600s; #配置点1 
-#         proxy_read_timeout 3600s; #配置点2,如果没效,可以考虑这个时间配置长一点 
-#         proxy_send_timeout 3600s; #配置点3 
-#         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 REMOTE-HOST $remote_addr;
-#         #proxy_bind $remote_addr transparent;
-#         proxy_http_version 1.1;
-#         proxy_set_header Upgrade $http_upgrade;
-#         proxy_set_header Connection "upgrade";
-#         # rewrite /socket/(.*) /$1 break;
-#         proxy_redirect off;
-        
-#     } 
-    
-#     location /socket {  
-#         proxy_pass http://backend/socket;   
-#         proxy_connect_timeout 3600s; #配置点1 
-#         proxy_read_timeout 3600s; #配置点2,如果没效,可以考虑这个时间配置长一点 
-#         proxy_send_timeout 3600s; #配置点3 
-#         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 REMOTE-HOST $remote_addr;
-#         #proxy_bind $remote_addr transparent;
-#         proxy_http_version 1.1;
-#         proxy_set_header Upgrade $http_upgrade;
-#         proxy_set_header Connection "upgrade";
-#         rewrite /socket/(.*) /$1 break;
-#         proxy_redirect off;
-        
-#     } 
 
- 
-    location /adminer/ 
-    {
-        proxy_pass http://adminer:8080/;
+    # socket需额外配置
+    location /socket {
+        proxy_pass http://cool/socket;
+        proxy_connect_timeout 3600s; #配置点1
+        proxy_read_timeout 3600s; #配置点2,如果没效,可以考虑这个时间配置长一点
+        proxy_send_timeout 3600s; #配置点3
         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 REMOTE-HOST $remote_addr;
+        #proxy_bind $remote_addr transparent;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        rewrite /socket/(.*) /$1 break;
+        proxy_redirect off;
 
-        #缓存相关配置
-        #proxy_cache cache_one;
-        #proxy_cache_key $host$request_uri$is_args$args;
-        #proxy_cache_valid 200 304 301 302 1h;
-
-        #持久化连接相关配置
-        proxy_connect_timeout 3000s;
-        proxy_read_timeout 86400s;
-        proxy_send_timeout 3000s;
-        #proxy_http_version 1.1;
-        #proxy_set_header Upgrade $http_upgrade;
-        #proxy_set_header Connection "upgrade";
-
-        add_header X-Cache $upstream_cache_status;
-
-        #expires 12h;
     }
-       
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-      root   /usr/share/nginx/html;
-    }
-
   }
 }