perf: merge with osm

Author: ibuler

.github/workflows/build-static-image.yml

@@ -3,11 +3,12 @@ name: Build and Push Base Image
 on:
   push:
     branches:
-      - 'pr*'
+      - "pr*"
+      - "osm"
     paths:
-      - 'versions.txt'
-      - 'prepare.sh'
-      - 'Dockerfile-static'
+      - "versions.txt"
+      - "prepare.sh"
+      - "Dockerfile-static"
 
 jobs:
   build-and-push:
@@ -44,6 +45,7 @@ jobs:
           push: true
           tags: jumpserver/web-static:${{ env.IMAGE_TAG }}
           file: Dockerfile-static
+          context: .
 
       - name: Get current branch name
         id: get_branch

Dockerfile

@@ -2,32 +2,36 @@ ARG VERSION=dev
 FROM jumpserver/lina:${VERSION} AS lina
 FROM jumpserver/luna:${VERSION} AS luna
 
-FROM nginx:1.29-trixie
+FROM nginx:1.31-trixie
 ARG TARGETARCH
 
-ARG CHECK_VERSION=v1.0.5
 ARG APT_MIRROR=http://deb.debian.org
 
 ARG TOOLS="                           \
         ca-certificates               \
         wget                          \
-        curl                          \
-        vim                           \
         logrotate                     \
         "
 
 RUN set -ex \
     && rm -f /etc/apt/apt.conf.d/docker-clean \
     && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list.d/debian.sources\
     && apt-get update > /dev/null \
+    && apt-get -y upgrade \
     && apt-get -y install --no-install-recommends ${TOOLS} \
+    && wget https://github.com/jumpserver-dev/healthcheck/releases/latest/download/check_linux_${TARGETARCH}.deb \
+    && dpkg -i check_linux_${TARGETARCH}.deb \
+    && apt-get purge -y wget \
+        curl \
+        nginx-module-xslt \
+        nginx-module-njs \
+        libxml2 \
+        libxslt1.1 \
+        libgd3 \
+    && apt-get -y autoremove \
     && apt-get clean \
-    && wget https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
-    && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
-    && mv check /usr/local/bin/ \
-    && chown root:root /usr/local/bin/check \
-    && chmod 755 /usr/local/bin/check \
-    && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
+    && rm -f check_linux_${TARGETARCH}.deb \
+    && rm -f /etc/nginx/conf.d/default.conf
 
 WORKDIR /opt
 
@@ -36,6 +40,5 @@ COPY --from=luna /opt/luna /opt/luna
 COPY versions.txt /opt/download/versions.txt
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY includes /etc/nginx/includes
-COPY default.conf /etc/nginx/conf.d/default.conf
-COPY http_server.conf /etc/nginx/sites-enabled/http_server.conf
+COPY http_server.conf /etc/nginx/conf.d/http_server.conf
 COPY init.sh /docker-entrypoint.d/40-init-config.sh

Dockerfile-ee

@@ -1,5 +1,5 @@
 ARG VERSION=dev
-FROM jumpserver/web-static:20260122_091122 AS static
+FROM jumpserver/web-static:20260617_103847 AS static
 FROM jumpserver/web:${VERSION}-ce
 
 COPY --from=static /opt/ /opt/

Dockerfile-static

@@ -3,6 +3,7 @@ ARG TARGETARCH
 
 WORKDIR /tmp
 COPY . .
+
 RUN set -ex \
     && apk add --no-cache bash \
     && bash ./prepare.sh

http_server.conf

@@ -3,21 +3,11 @@ server {
     # listen [::]:80;
     # server_name demo.jumpserver.org;  # 取消注释并自行修改成你自己的域名
 
-    client_max_body_size 5000m;
+    client_max_body_size 4096m;
 
     location / {
-        proxy_pass http://localhost:51980;
-        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 $http_connection;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_ignore_client_abort on;
-        proxy_connect_timeout 600;
-        proxy_send_timeout 600;
-        proxy_read_timeout 600;
-        send_timeout 6000;
-  }
+        rewrite ^/(.*)$ /ui/$1 last;
+    }
+
+    include includes/*.conf;
 }

includes/chen.conf

@@ -1,5 +1,6 @@
 location /chen/ {
-    proxy_pass http://chen:8082;
+    set $chen_upstream chen:8082;
+    proxy_pass http://$chen_upstream;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;

default.conf includes/common.confdefault.conf renamed to includes/common.conf

@@ -1,8 +1,3 @@
-server {
-    listen 51980;
-    # listen [::]:51980;
-
-    client_max_body_size 5000m;
 
     # For wecom verify
     location ~* ^/WW_verify_[^.]+\.txt$ {
@@ -22,7 +17,7 @@ server {
 
     location /web/health/ {
         access_log off;
-        add_header Content-Type 'application/json';
+        default_type application/json;
         return 200 '{"status": "ok"}';
     }
 
@@ -47,12 +42,5 @@ server {
     }
 
     location @redirect_oss {
-        rewrite ^/download/(.*)$ https://static.jumpserver.org/download/$1 permanent;
-    }
-
-    location / {
-        rewrite ^/(.*)$ /ui/$1 last;
-    }
-
-    include includes/*.conf;
-}
+        rewrite ^/download/(.*)$ https://static.jumpserver.org/download/$1?v=osm;
+    }

includes/core.conf

@@ -8,7 +8,8 @@ location /private-media/ {
 }
 
 location /ws/ {
-    proxy_pass http://core:8080;
+    set $core_upstream core:8080;
+    proxy_pass http://$core_upstream;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
@@ -18,7 +19,8 @@ location /ws/ {
 }
 
 location ~ ^/(core|api|media)/ {
-    proxy_pass http://core:8080;
+    set $core_upstream core:8080;
+    proxy_pass http://$core_upstream;
     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,5 +1,6 @@
 location /koko/ {
-    proxy_pass http://koko:5000;
+    set $koko_upstream koko:5000;
+    proxy_pass http://$koko_upstream;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;

includes/lion.conf

@@ -1,5 +1,6 @@
 location /lion/ {
-    proxy_pass http://lion:8081;
+    set $lion_upstream lion:8081;
+    proxy_pass http://$lion_upstream;
     proxy_buffering off;
     proxy_http_version 1.1;
     proxy_request_buffering off;