Merge branch 'dev' of github.com:jumpserver/docker-web into dev

Author: ibuler

Dockerfile-ee

@@ -1,5 +1,5 @@
 ARG VERSION=dev
-FROM jumpserver/web-static:20260713_024102 AS static
+FROM jumpserver/web-static:20260716_073445 AS static
 FROM jumpserver/web:${VERSION}-ce
 
 COPY --from=static /opt/ /opt/

includes/chen.conf

@@ -1,6 +1,5 @@
 location /chen/ {
-    set $chen_upstream chen:8082;
-    proxy_pass http://$chen_upstream;
+    proxy_pass http://chen:8082;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;
@@ -13,4 +12,4 @@ location /chen/ {
     proxy_send_timeout 600;
     proxy_read_timeout 600;
     send_timeout 6000;
-}
+}

includes/common.conf

@@ -42,5 +42,5 @@
     }
 
     location @redirect_oss {
-        rewrite ^/download/(.*)$ https://static.jumpserver.org/download/$1?v=osm;
+        rewrite ^/download/(.*)$ https://static.jumpserver.org/download/$1;
     }

includes/core.conf

@@ -8,8 +8,7 @@ location /private-media/ {
 }
 
 location /ws/ {
-    set $core_upstream core:8080;
-    proxy_pass http://$core_upstream;
+    proxy_pass http://core:8080;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
@@ -19,8 +18,7 @@ location /ws/ {
 }
 
 location ~ ^/(core|api|media)/ {
-    set $core_upstream core:8080;
-    proxy_pass http://$core_upstream;
+    proxy_pass http://core:8080;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_ignore_client_abort on;

includes/koko.conf

@@ -1,6 +1,5 @@
 location /koko/ {
-    set $koko_upstream koko:5000;
-    proxy_pass http://$koko_upstream;
+    proxy_pass http://koko:5000;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;
@@ -13,4 +12,4 @@ location /koko/ {
     proxy_send_timeout 600;
     proxy_read_timeout 600;
     send_timeout 6000;
-}
+}

includes/kotl.conf.disabled

@@ -0,0 +1,16 @@
+location ~ ^/jdmc(?:/|$) {
+    proxy_pass https://host.docker.internal:9898;
+    proxy_ssl_verify off;
+    proxy_buffering off;
+    proxy_request_buffering off;
+    proxy_http_version 1.1;
+    proxy_set_header Host $host;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_ignore_client_abort on;
+    proxy_connect_timeout 600;
+    proxy_send_timeout 600;
+    proxy_read_timeout 600;
+    send_timeout 6000;
+}

includes/lion.conf

@@ -1,6 +1,5 @@
 location /lion/ {
-    set $lion_upstream lion:8081;
-    proxy_pass http://$lion_upstream;
+    proxy_pass http://lion:8081;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;
@@ -13,4 +12,4 @@ location /lion/ {
     proxy_send_timeout 600;
     proxy_read_timeout 600;
     send_timeout 6000;
-}
+}

init.sh

@@ -72,6 +72,7 @@ function config_https() {
   config_nginx "${config_file}"
 
   sed -i "s@server web:.*;@server localhost:51980;@g" "${config_file}"
+  sed -i 's@https://$server_name$request_uri;@https://$host$request_uri;@g' "${config_file}"
 
   if [ "${USE_IPV6}" == "1" ]; then
     sed -i "s@# listen \[::\]:443@listen \[::\]:443@g" "${config_file}"
@@ -112,6 +113,12 @@ function config_components() {
     safe_move /etc/nginx/includes/chen.conf /etc/nginx/includes/chen.conf.disabled
   fi
 
+  if [ "${KOTL_ENABLED}" == "1" ]; then
+    safe_move /etc/nginx/includes/kotl.conf.disabled /etc/nginx/includes/kotl.conf
+  else
+    safe_move /etc/nginx/includes/kotl.conf /etc/nginx/includes/kotl.conf.disabled
+  fi
+
   if [ "${FACELIVE_ENABLED}" == "0" ]; then
     safe_move /etc/nginx/includes/facelive.conf /etc/nginx/includes/facelive.conf.disabled
   fi
@@ -158,4 +165,4 @@ function main() {
   config_gzip
 }
 
-main
+main

versions.txt

@@ -11,4 +11,4 @@ OPENSSH_VERSION=v9.4.0.0
 MONGOSH_VERSION=2.2.12
 TINKER_VERSION=v0.2.3
 CLIENT_VERSION=4.1.5
-CLIENT_NAME=JumpServer
+CLIENT_NAME=JumpServer