From 40b59b958b595f275d6f29cab9d5c9d2bf9442ea Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 26 Apr 2024 10:56:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 优化docker
---
 build.sh             |  4 ++--
 docker-entrypoint.sh | 16 ++++++++++------
 nginx.conf           | 44 +++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index 5bbf1f2e..6ead7b78 100644
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.2.0-SNAPSHOT .
-docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.2.0-SNAPSHOT
+docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-TEST .
+docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.1.0-TEST
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 20ab9f38..1b05fc13 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -8,18 +8,22 @@ if [ -z "$API_BASE_PATH" ]; then
     API_BASE_PATH="http://jetlinks:8844/";
 fi
 
-if [ -z "$SERVER_NAME" ]; then
-    SERVER_NAME="localhost";
-fi
 
 apiUrl="proxy_pass  $API_BASE_PATH\$1;"
 resolver="resolver $NAMESERVERS ipv6=off;"
-serverName="server_name $SERVER_NAME;"
 
-sed -i '4c '"$serverName"'' /etc/nginx/conf.d/default.conf
 sed -i '11c '"$resolver"'' /etc/nginx/conf.d/default.conf
 sed -i '25c '"$apiUrl"'' /etc/nginx/conf.d/default.conf
-sed -i 's/\${SERVER_NAME}/'$SERVER_NAME'/g' /etc/nginx/conf.d/default.conf
+
+if [ -z "$SERVER_NAME" ]; then
+    serverName="server_name localhost;"
+    sed -i '4c '"$serverName"'' /etc/nginx/conf.d/default.conf
+    sed -i '15,17d' /etc/nginx/conf.d/default.conf
+else
+    serverName="server_name $SERVER_NAME;"
+    sed -i '4c '"$serverName"'' /etc/nginx/conf.d/default.conf
+    sed -i 's/\${SERVER_NAME}/'$SERVER_NAME'/g' /etc/nginx/conf.d/default.conf
+fi
 
 nginx -g "daemon off;"
 
diff --git a/nginx.conf b/nginx.conf
index 2fbb13b8..7ef39652 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1 +1,43 @@
-server {
    listen 80;
    listen [::]:80;
    server_name _;
    gzip on;
    gzip_min_length 1k;
    gzip_comp_level 9;
    gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml;
    gzip_vary on;
    gzip_disable "MSIE [1-6]\.";
    resolver $NAMESERVERS ipv6=off;
    root /usr/share/nginx/html;
    include /etc/nginx/mime.types;

    if ($http_Host !~* ^${SERVER_NAME}) {
        return 403;
    }

    location / {
        index  index.html;
    }

    location ^~/api/ {
        if ($request_uri ~* ^/api/(.*)$) {
            proxy_pass http://host.docker.internal:8840/$1;
        }
        #proxy_pass http://host.docker.internal:8840/;
        proxy_set_header X-Forwarded-Proto $scheme;
        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_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection "upgrade";
        proxy_connect_timeout   1;
        proxy_buffering off;
        chunked_transfer_encoding off;
        proxy_cache off;
        proxy_send_timeout      30m;
        proxy_read_timeout      30m;
        client_max_body_size    500m;
    }
}
\ No newline at end of file
+server {
+    listen 80;
+    listen [::]:80;
+    server_name _;
+    gzip on;
+    gzip_min_length 1k;
+    gzip_comp_level 9;
+    gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml;
+    gzip_vary on;
+    gzip_disable "MSIE [1-6]\.";
+    resolver $NAMESERVERS ipv6=off;
+    root /usr/share/nginx/html;
+    include /etc/nginx/mime.types;
+
+    if ($http_Host !~* ^${SERVER_NAME}) {
+        return 403;
+    }
+
+    location / {
+        index  index.html;
+    }
+
+    location ^~/api/ {
+        if ($request_uri ~* ^/api/(.*)$) {
+            proxy_pass http://host.docker.internal:8840/$1;
+        }
+        #proxy_pass http://host.docker.internal:8840/;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        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_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_connect_timeout   1;
+        proxy_buffering off;
+        chunked_transfer_encoding off;
+        proxy_cache off;
+        proxy_send_timeout      30m;
+        proxy_read_timeout      30m;
+        client_max_body_size    500m;
+    }
+}