🎉 version(architecture): v0.3

Ting-Code · Aug 20, 2024 · 1454d8a · 1454d8a
1 parent 08c82a8
commit 1454d8a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -6,6 +6,6 @@ COPY ./packages/apps/micro-docs/dist/ /usr/share/nginx/html/docs/
 # 复制nginx配置到容器中
 COPY ./.github/workflows/nginx.conf /etc/nginx/nginx.conf
 # 指定端口
-EXPOSE 80
+EXPOSE 80 8680
 # 启动 Nginx
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/.github/workflows/dockerBootstrap.sh b/.github/workflows/dockerBootstrap.sh
@@ -10,4 +10,4 @@ docker rmi tingcode/web-admin:latest
 # 拉取镜像
 docker pull tingcode/web-admin:latest
 
-docker run --rm -d -p 80:80 -p 8680:8680 --name web-admin tingcode/web-admin:latest
+docker run --rm -d -p 80:80 -p 8081:8081 -p 8680:8680 --net host --name web-admin tingcode/web-admin:latest
diff --git a/.github/workflows/nginx.conf b/.github/workflows/nginx.conf
@@ -28,7 +28,7 @@ http {
         # 监听的端口
         listen       80;
         # 服务器名称
-        server_name  localhost;
+        server_name 139.199.173.241;
 
         location / {
             if ($request_filename ~* .*\.(?:htm|html)$)  ## 配置页面不缓存html和htm结尾的文件
@@ -86,9 +86,21 @@ http {
         # 监听的端口
         listen       8680;
         # 服务器名称
-        server_name  localhost;
+        server_name  139.199.173.241;
         # location /docs 则最后不加/
         # location /docs/ 则最后加/
+        location / {
+            if ($request_filename ~* .*\.(?:htm|html)$)  ## 配置页面不缓存html和htm结尾的文件
+            {
+               add_header Cache-Control "private, no-store, no-cache, must-revalidate, proxy-revalidate";
+            }
+            # 把匹配到的路径重写, 注意要以/结尾
+            root /usr/share/nginx/html/docs;
+            # 默认首页
+            index  index.html;
+            # 尝试从磁盘找到请求的文件，如果不存在则跳转到 index.html
+            try_files $uri $uri/ /index.html;
+        }
         location /docs {
             if ($request_filename ~* .*\.(?:htm|html)$)  ## 配置页面不缓存html和htm结尾的文件
             {
@@ -98,18 +110,8 @@ http {
             alias /usr/share/nginx/html/docs;
             # 默认首页
             index  index.html;
-            try_files $uri $uri/ /docs/index.html;
-        }
-        # 定义 404 页面
-        error_page  404              /404.html;
-        location = /404.html {
-            root   /usr/share/nginx/html;
-        }
-
-        # 定义 50x 页面
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   /usr/share/nginx/html;
+            # 尝试从磁盘找到请求的文件，如果不存在则跳转到 index.html
+            try_files $uri $uri/ /index.html;
         }
     }
 }