Merge pull request #255 from jumpserver/dev

v4.4.0

.github/workflows/check-deps-versions.yml

@@ -78,4 +78,4 @@ jobs:
         run: |
           git add .
           git commit -m "Update pkg versions"
-          git push origin 
+          git push origin pr@${{ matrix.branch }}@upgrade_client

Dockerfile

@@ -5,7 +5,7 @@ FROM jumpserver/luna:${VERSION} AS luna
 FROM nginx:1.24-bullseye
 ARG TARGETARCH
 
-ARG CHECK_VERSION=v1.0.3
+ARG CHECK_VERSION=v1.0.4
 ARG APT_MIRROR=http://deb.debian.org
 
 ARG TOOLS="                           \

Dockerfile-ee

@@ -1,5 +1,5 @@
 ARG VERSION=dev
-FROM jumpserver/web-static:20241012_082502 AS static
+FROM jumpserver/web-static:20241121_062038 AS static
 FROM jumpserver/web:${VERSION}-ce
 
 COPY --from=static /opt/ /opt/

Dockerfile-static

@@ -1,45 +1,8 @@
-FROM python:3.11-alpine3.20 AS stage-build
-ARG TARGETARCH
-
-ARG DEPENDENCIES="            \
-        ca-certificates       \
-        curl                  \
-        zip"
-
-RUN apk add --no-cache ${DEPENDENCIES}
-
-WORKDIR /opt/applets
-
-COPY ../requirements.txt ./requirements.txt
-
-ARG PIP_MIRROR=https://pypi.org/simple
-RUN set -ex \
-    && mkdir pip_packages build \
-    && pip config set global.index-url ${PIP_MIRROR} \
-    && pip download \
-          --only-binary=:all: --platform win_amd64 \
-          --python-version 3.11.6 --abi cp311 \
-          -d pip_packages -r requirements.txt -i${PIP_MIRROR} \
-    && cp requirements.txt pip_packages \
-    && zip -r pip_packages.zip pip_packages \
-    && mv pip_packages.zip build
-
-ARG CHECK_VERSION=v1.0.2
-RUN set -ex \
-    && 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
-
 FROM alpine:3.20
+ARG TARGETARCH
 
 WORKDIR /tmp
 COPY . .
 RUN set -ex \
     && apk add --no-cache bash \
     && bash ./prepare.sh
-
-COPY --from=stage-build /opt/applets/build /opt/download/applets
-COPY --from=stage-build /usr/local/bin/check /usr/local/bin/check

includes/facelive.conf

@@ -0,0 +1,15 @@
+location /facelive/ {
+    proxy_pass http://facelive:9999;
+    proxy_buffering off;
+    proxy_http_version 1.1;
+    proxy_request_buffering off;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+    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;
+}

init.sh

@@ -134,6 +134,10 @@ function config_components() {
     safe_move /etc/nginx/includes/chen.conf /etc/nginx/includes/chen.conf.disabled
   fi
 
+  if [ "${FACELIVE_ENABLED}" == "0" ]; then
+    safe_move /etc/nginx/includes/facelive.conf /etc/nginx/includes/facelive.conf.disabled
+  fi
+
   if [[ "${USE_XPACK}" == "1" && "${RAZOR_ENABLED}" != "0" ]]; then
     safe_move /etc/nginx/includes/razor.conf.disabled /etc/nginx/includes/razor.conf
   fi

prepare.sh

@@ -22,16 +22,16 @@ mkdir -p ${DOWNLOAD_DIR}/applets
 cd ${DOWNLOAD_DIR}/applets || exit 1
 wget -O chromedriver-${CHROME_DRIVER_VERSION}-win64.zip https://github.com/jumpserver-dev/Chrome-Portable-Win64/releases/download/${CHROME_DRIVER_VERSION}/chromedriver-win64.zip
 wget -O chrome-${CHROME_VERSION}-win.zip https://github.com/jumpserver-dev/Chrome-Portable-Win64/releases/download/${CHROME_VERSION}/chrome-win.zip
-wget https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-amd64.exe
+wget https://github.com/jumpserver-dev/Python-Embed-Win64/releases/download/${PYTHON_VERSION}/jumpserver-tinker-python-${PYTHON_VERSION}-win64.zip
 wget ${DOWNLOAD_URL}/public/dbeaver-ce-${DBEAVER_VERSION}-x86_64-setup.exe
 wget ${DOWNLOAD_URL}/public/dbeaver-patch-${DBEAVER_VERSION}-x86_64-setup.msi
 wget ${DOWNLOAD_URL}/public/Tinker_Installer_${TINKER_VERSION}.exe
 
 mkdir -p ${DOWNLOAD_DIR}/public
 cd ${DOWNLOAD_DIR}/public || exit 1
 wget ${DOWNLOAD_URL}/public/Microsoft_Remote_Desktop_${MRD_VERSION}_installer.pkg
-wget https://github.com/jumpserver/VideoPlayer/releases/download/v${VIDEO_PLAYER_VERSION}/JumpServer.Video.Player-${VIDEO_PLAYER_VERSION}.dmg
-wget https://github.com/jumpserver/VideoPlayer/releases/download/v${VIDEO_PLAYER_VERSION}/JumpServer.Video.Player.Setup.${VIDEO_PLAYER_VERSION}.exe
+wget https://github.com/jumpserver/VideoPlayer/releases/download/v${VIDEO_PLAYER_VERSION}/JumpServerVideoPlayer-${VIDEO_PLAYER_VERSION}.dmg
+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" "mac-${CLIENT_VERSION}-x64.dmg" "mac-${CLIENT_VERSION}-arm64.dmg"

versions.txt

@@ -2,13 +2,13 @@
 # 1. https://github.com/jumpserver/jumpserver/blob/dev/apps/jumpserver/views/other.py#L99
 # 2. https://github.com/jumpserver/jumpserver/blob/dev/apps/terminal/automations/deploy_applet_host/playbook.yml#L18
 PLAY_VERSION=1.1.0-1
-PYTHON_VERSION=3.11.6
+PYTHON_VERSION=3.11.10
 CHROME_VERSION=118.0.5993.118
 CHROME_DRIVER_VERSION=118.0.5993.70
 DBEAVER_VERSION=22.3.4
 MRD_VERSION=10.6.7
 OPENSSH_VERSION=v9.4.0.0
 MONGOSH_VERSION=2.2.12
-TINKER_VERSION=v0.1.9
-VIDEO_PLAYER_VERSION=0.1.9
+TINKER_VERSION=v0.2.0
+VIDEO_PLAYER_VERSION=0.2.0
 CLIENT_VERSION=v2.1.3