Merge pull request #304 from jumpserver/dev

v4.10.13-lts

Author: baijiangjie

Dockerfile

@@ -2,7 +2,7 @@ ARG VERSION=dev
 FROM jumpserver/lina:${VERSION} AS lina
 FROM jumpserver/luna:${VERSION} AS luna
 
-FROM jumpserver/nginx:1.24-bullseye
+FROM nginx:1.29-trixie
 ARG TARGETARCH
 
 ARG CHECK_VERSION=v1.0.5
@@ -17,7 +17,7 @@ ARG TOOLS="                           \
 
 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 \
+    && sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list.d/debian.sources\
     && apt-get update > /dev/null \
     && apt-get -y install --no-install-recommends ${TOOLS} \
     && apt-get clean \

Dockerfile-ee

@@ -1,5 +1,5 @@
 ARG VERSION=dev
-FROM jumpserver/web-static:20250916_103824 AS static
+FROM jumpserver/web-static:20251120_103310 AS static
 FROM jumpserver/web:${VERSION}-ce
 
 COPY --from=static /opt/ /opt/

Dockerfile-nginx

@@ -34,10 +34,17 @@ wget https://github.com/jumpserver/VideoPlayer/releases/download/v${VIDEO_PLAYER
 wget https://github.com/jumpserver/VideoPlayer/releases/download/v${VIDEO_PLAYER_VERSION}/JumpServerVideoPlayer-${VIDEO_PLAYER_VERSION}.exe
 wget https://github.com/PowerShell/Win32-OpenSSH/releases/download/${OPENSSH_VERSION}p1-Beta/OpenSSH-Win64-${OPENSSH_VERSION}.msi
 
-clients=("win-${CLIENT_VERSION}-x64.exe" "win-${CLIENT_VERSION}-x64.msi" "mac-${CLIENT_VERSION}-x64.dmg" "mac-${CLIENT_VERSION}-arm64.dmg"
-         "linux-${CLIENT_VERSION}-amd64.deb" "linux-${CLIENT_VERSION}-arm64.deb")
+clients=(
+    "JumpServerClient_${CLIENT_VERSION}_x64_en-US.msi"
+    "JumpServerClient_${CLIENT_VERSION}_x64-setup.exe"
+    "JumpServerClient_${CLIENT_VERSION}_aarch64.dmg"
+    "JumpServerClient_${CLIENT_VERSION}_x64.dmg"
+    "JumpServerClient_${CLIENT_VERSION}_amd64.AppImage"
+    "JumpServerClient_${CLIENT_VERSION}_amd64.deb"
+    "JumpServerClient-${CLIENT_VERSION}-1.x86_64.rpm"
+)
 for client in "${clients[@]}"; do
-    wget "https://github.com/jumpserver/clients/releases/download/${CLIENT_VERSION}/JumpServer-Client-Installer-${client}"
+    wget "https://github.com/jumpserver/clients/releases/download/v${CLIENT_VERSION}/${client}"
 done
 
 for arch in x64 arm64; do

prepare.sh

@@ -11,4 +11,4 @@ OPENSSH_VERSION=v9.4.0.0
 MONGOSH_VERSION=2.2.12
 TINKER_VERSION=v0.2.2
 VIDEO_PLAYER_VERSION=0.6.0
-CLIENT_VERSION=v3.0.7
+CLIENT_VERSION=4.0.0