feat: 更新 v3.9.0

jumpserver · Nov 16, 2023 · ac38850 · ac38850
1 parent 2645449
commit ac38850
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 113 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ vi .env
 ```
 ```vim
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.8.2
+VERSION=v3.9.0
 
 # 构建参数, 支持 amd64/arm64/loong64
 TARGETARCH=amd64

diff --git a/allinone/Dockerfile b/allinone/Dockerfile
@@ -1,5 +1,6 @@
 FROM jumpserver/redis:7.0-buster as redis
 FROM jumpserver/guacd:1.5.3-buster as guacd
+FROM umpserver/web-static:v1.0.1 as static
 FROM jumpserver/openjdk:17-slim-buster as openjdk
 FROM jumpserver/python:3.11-slim-buster as get-core
 ARG TARGETARCH
@@ -21,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -41,58 +42,6 @@ RUN set -ex \
     && cd utils \
     && bash -ixeu build.sh
 
-FROM jumpserver/python:3.11-slim-buster as build-tinker
-ARG TARGETARCH
-
-ARG TOOLS="                           \
-        ca-certificates               \
-        wget"
-
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    set -ex \
-    && rm -f /etc/apt/apt.conf.d/docker-clean \
-    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends ${BUILD_DEPENDENCIES} \
-    && apt-get -y install --no-install-recommends ${DEPENDENCIES} \
-    && apt-get -y install --no-install-recommends ${TOOLS} \
-    && echo "no" | dpkg-reconfigure dash
-
-WORKDIR /opt
-
-ARG Client_VERSION=v2.0.2
-ARG MRD_VERSION=10.6.7
-ARG VIDEO_PLAYER_VERSION=0.1.9
-ARG OPENSSH_VERSION=v9.2.0.0
-RUN set -ex \
-    && mkdir -p /opt/download/public \
-    && cd /opt/download/public \
-    && wget -qO JumpServer-Client-Installer-x86_64.msi https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-x86_64.msi \
-    && wget -qO JumpServer-Client-Installer-x86_64.exe https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-x86_64.exe \
-    && wget -qO JumpServer-Client-Installer-amd64.dmg https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-amd64.dmg \
-    && wget -qO JumpServer-Client-Installer-arm64.dmg https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-arm64.dmg \
-    && wget -qO JumpServer-Client-Installer-amd64.deb https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-amd64.deb \
-    && wget -qO JumpServer-Client-Installer-arm64.deb https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-arm64.deb \
-    && wget -qO JumpServer-Video-Player.dmg https://github.com/jumpserver/VideoPlayer/releases/download/v0.1.9/JumpServer.Video.Player-${VIDEO_PLAYER_VERSION}.dmg \
-    && wget -qO JumpServer-Video-Player.exe https://github.com/jumpserver/VideoPlayer/releases/download/v0.1.9/JumpServer.Video.Player.Setup.${VIDEO_PLAYER_VERSION}.exe \
-    && wget -qO OpenSSH-Win64.msi https://github.com/PowerShell/Win32-OpenSSH/releases/download/${OPENSSH_VERSION}p1-Beta/OpenSSH-Win64-${OPENSSH_VERSION}.msi \
-    && wget -q https://download.jumpserver.org/public/Microsoft_Remote_Desktop_${MRD_VERSION}_installer.pkg
-
-ARG TINKER_VERSION=v0.1.2
-ARG PYTHON_VERSION=3.10.11
-ARG CHROME_VERSION=114.0.5735.134
-ARG DBEAVER_VERSION=22.3.4
-RUN set -ex \
-    && mkdir -p /opt/download/applets \
-    && cd /opt/download/applets \
-    && wget -qO Tinker_Installer.exe https://download.jumpserver.org/public/Tinker_Installer_${TINKER_VERSION}.exe \
-    && wget -qO dbeaver-patch.msi https://download.jumpserver.org/public/dbeaver-patch-${DBEAVER_VERSION}-x86_64-setup.msi \
-    && wget -q https://github.com/wojiushixiaobai/Chrome-Portable-Win64/releases/download/${CHROME_VERSION}/chromedriver_win32.zip \
-    && wget -q https://github.com/wojiushixiaobai/Chrome-Portable-Win64/releases/download/${CHROME_VERSION}/chrome-win.zip \
-    && wget -q https://download.jumpserver.org/public/dbeaver-ce-${DBEAVER_VERSION}-x86_64-setup.exe \
-    && wget -q https://download.jumpserver.org/public/python-${PYTHON_VERSION}-amd64.exe
-
 FROM jumpserver/python:3.11-slim-buster as build-core
 ARG TARGETARCH
 
@@ -169,9 +118,9 @@ ARG PYTHONUNBUFFERED=1 \
 RUN --mount=type=cache,target=/root/.cache \
     set -ex \
     && python3 -m venv /opt/py3 \
-    && . /opt/py3/bin/activate \
     && pip install poetry \
     && poetry config virtualenvs.create false \
+    && . /opt/py3/bin/activate \
     && poetry install --only=main
 
 FROM jumpserver/python:3.11-slim-buster
@@ -180,6 +129,7 @@ ENV LANG=zh_CN.UTF-8
 
 ARG DEPENDENCIES="                    \
         libjpeg-dev                   \
+        libx11-dev                    \
         libxmlsec1-openssl"
 
 ARG TOOLS="                           \
@@ -335,9 +285,9 @@ RUN set -ex \
 COPY --from=redis /usr/local/bin/redis-cli /usr/local/bin/redis-cli
 COPY --from=build-core /opt/py3 /opt/py3
 COPY --from=get-core /opt/jumpserver/release/jumpserver /opt/jumpserver
-COPY --from=build-tinker /opt/download /opt/download
+COPY --from=static /opt/download /opt/download
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=${VERSION}
 ENV PATH=/opt/py3/bin:$PATH
 

diff --git a/allinone/README.md b/allinone/README.md
@@ -102,7 +102,7 @@ docker run --name jms_all -d \
   -v /opt/jumpserver/kael/data:/opt/kael/data \
   -v /opt/jumpserver/chen/data:/opt/chen/data \
   -v /opt/jumpserver/web/log:/var/log/nginx \
-  jumpserver/jms_all:v3.8.2
+  jumpserver/jms_all:v3.9.0
 ```
 
 **升级**
@@ -118,7 +118,7 @@ mysqldump -h$DB_HOST -p$DB_PORT -u$DB_USER -p$DB_PASSWORD $DB_NAME > /opt/jumpse
 # 例: mysqldump -h192.168.100.11 -p3306 -ujumpserver -pnu4x599Wq7u0Bn8EABh3J91G jumpserver > /opt/jumpserver-v2.12.0.sql
 
 # 拉取新版本镜像
-docker pull jumpserver/jms_all:v3.8.2
+docker pull jumpserver/jms_all:v3.9.0
 
 # 删掉旧版本容器
 docker rm jms_all
@@ -147,4 +147,4 @@ docker run --name jms_all -d \
   -v /opt/jumpserver/kael/data:/opt/kael/data \
   -v /opt/jumpserver/chen/data:/opt/chen/data \
   -v /opt/jumpserver/web/log:/var/log/nginx \
-  jumpserver/jms_all:v3.8.2
+  jumpserver/jms_all:v3.9.0
diff --git a/allinone/readme.txt b/allinone/readme.txt
@@ -11,4 +11,4 @@ The Installation is Complete.
   ╚█████╔╝╚██████╔╝██║ ╚═╝ ██║██║     ███████║███████╗██║  ██║ ╚████╔╝ ███████╗██║  ██║
    ╚════╝  ╚═════╝ ╚═╝     ╚═╝╚═╝     ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝
 
-                                                                   VERSION: v3.8.2
+                                                                   VERSION: v3.9.0
diff --git a/chen/Dockerfile b/chen/Dockerfile
@@ -51,7 +51,7 @@ RUN set -ex \
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=${VERSION}
 
 RUN set -ex \

diff --git a/config_example.conf b/config_example.conf
@@ -1,5 +1,5 @@
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.8.2
+VERSION=v3.9.0
 
 # 构建参数, 支持 amd64/arm64/loong64
 TARGETARCH=amd64

diff --git a/core/Dockerfile b/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/python:3.11-slim-buster as get-core
+FROM jumpserver/python:3.11-slim-buster as stage-1
 ARG TARGETARCH
 
 ARG DEPENDENCIES="                    \
@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -38,7 +38,7 @@ RUN set -ex \
     && cd utils \
     && bash -ixeu build.sh
 
-FROM jumpserver/python:3.11-slim-buster as build-core
+FROM jumpserver/python:3.11-slim-buster as stage-2
 ARG TARGETARCH
 
 ARG BUILD_DEPENDENCIES="              \
@@ -104,18 +104,19 @@ RUN set -ex \
         cd /opt && rm -rf /opt/rust-install /opt/rust.tar.gz; \
     fi
 
-COPY --from=get-core /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml /opt/jumpserver/
+COPY --from=stage-1 /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml /opt/jumpserver/
 
 WORKDIR /opt/jumpserver
 
 ARG PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1
 
 RUN --mount=type=cache,target=/root/.cache \
+    set -ex \
     && python3 -m venv /opt/py3 \
-    && . /opt/py3/bin/activate \
     && pip install poetry \
     && poetry config virtualenvs.create false \
+    && . /opt/py3/bin/activate \
     && poetry install --only=main
 
 FROM jumpserver/python:3.11-slim-buster
@@ -125,6 +126,7 @@ ENV LANG=zh_CN.UTF-8 \
 
 ARG DEPENDENCIES="                    \
         libjpeg-dev                   \
+        libx11-dev                    \
         libxmlsec1-openssl"
 
 ARG TOOLS="                           \
@@ -156,14 +158,14 @@ RUN set -ex \
     && sed -i "s@# export @export @g" ~/.bashrc \
     && sed -i "s@# alias @alias @g" ~/.bashrc
 
-COPY --from=build-core /opt/py3 /opt/py3
-COPY --from=get-core /opt/jumpserver/release/jumpserver /opt/jumpserver
-
-ARG VERSION=v3.8.2
-ENV VERSION=${VERSION}
+COPY --from=stage-2 /opt/py3 /opt/py3
+COPY --from=stage-1 /opt/jumpserver/release/jumpserver /opt/jumpserver
 
 WORKDIR /opt/jumpserver
 
+ARG VERSION=v3.9.0
+ENV VERSION=${VERSION}
+
 VOLUME /opt/jumpserver/data
 
 EXPOSE 8080

diff --git a/kael/Dockerfile b/kael/Dockerfile
@@ -13,9 +13,7 @@ ARG DEPENDENCIES="                    \
 
 ARG APT_MIRROR=http://mirrors.ustc.edu.cn
 
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=kael \
-    sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
-    && rm -f /etc/apt/apt.conf.d/docker-clean \
+RUN set -ex \
     && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
     && apt-get update \
     && apt-get install -y --no-install-recommends ${DEPENDENCIES} \
@@ -38,7 +36,7 @@ RUN set -ex \
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=${VERSION}
 
 RUN set -ex \

diff --git a/koko/Dockerfile b/koko/Dockerfile
@@ -78,7 +78,7 @@ RUN set -ex \
 
 WORKDIR /opt/koko
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=${VERSION}
 
 RUN set -ex \

diff --git a/lion/Dockerfile b/lion/Dockerfile
@@ -26,7 +26,7 @@ RUN set -ex \
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=${VERSION}
 
 RUN set -ex \

diff --git a/magnus/Dockerfile b/magnus/Dockerfile
@@ -34,7 +34,7 @@ RUN set -ex \
 
 WORKDIR /opt/magnus
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=${VERSION}
 
 RUN set -ex \

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -1,3 +1,4 @@
+FROM registry.fit2cloud.com/jumpserver/web-static:v1.0.1 as static
 FROM nginx:1.24-buster
 ARG TARGETARCH
 ENV LANG=zh_CN.UTF-8
@@ -22,42 +23,11 @@ RUN set -ex \
     && apt-get clean all \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /opt/download/public
-
-ARG Client_VERSION=v2.0.2
-ARG MRD_VERSION=10.6.7
-ARG VIDEO_PLAYER_VERSION=0.1.9
-ARG OPENSSH_VERSION=v9.2.0.0
-
-RUN set -ex \
-    && wget -qO JumpServer-Client-Installer-x86_64.msi https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-x86_64.msi \
-    && wget -qO JumpServer-Client-Installer-x86_64.exe https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-x86_64.exe \
-    && wget -qO JumpServer-Client-Installer-amd64.dmg https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-amd64.dmg \
-    && wget -qO JumpServer-Client-Installer-arm64.dmg https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-arm64.dmg \
-    && wget -qO JumpServer-Client-Installer-amd64.deb https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-amd64.deb \
-    && wget -qO JumpServer-Client-Installer-arm64.deb https://github.com/jumpserver/clients/releases/download/${Client_VERSION}/JumpServer-Client-Installer-${Client_VERSION}-arm64.deb \
-    && wget -qO jumpServer-Video-Player.dmg https://github.com/jumpserver/VideoPlayer/releases/download/v0.1.9/JumpServer.Video.Player-${VIDEO_PLAYER_VERSION}.dmg \
-    && wget -qO JumpServer-Video-Player.exe https://github.com/jumpserver/VideoPlayer/releases/download/v0.1.9/JumpServer.Video.Player.Setup.${VIDEO_PLAYER_VERSION}.exe \
-    && wget -qO OpenSSH-Win64.msi https://github.com/PowerShell/Win32-OpenSSH/releases/download/${OPENSSH_VERSION}p1-Beta/OpenSSH-Win64-${OPENSSH_VERSION}.msi \
-    && wget -q https://download.jumpserver.org/public/Microsoft_Remote_Desktop_${MRD_VERSION}_installer.pkg
-
-WORKDIR /opt/download/applets
-
-ARG TINKER_VERSION=v0.1.2
-ARG PYTHON_VERSION=3.10.11
-ARG CHROME_VERSION=114.0.5735.134
-ARG DBEAVER_VERSION=22.3.4
-RUN set -ex \
-    && wget -qO Tinker_Installer.exe https://download.jumpserver.org/public/Tinker_Installer_${TINKER_VERSION}.exe \
-    && wget -qO dbeaver-patch.msi https://download.jumpserver.org/public/dbeaver-patch-${DBEAVER_VERSION}-x86_64-setup.msi \
-    && wget -q https://github.com/wojiushixiaobai/Chrome-Portable-Win64/releases/download/${CHROME_VERSION}/chromedriver_win32.zip \
-    && wget -q https://github.com/wojiushixiaobai/Chrome-Portable-Win64/releases/download/${CHROME_VERSION}/chrome-win.zip \
-    && wget -q https://download.jumpserver.org/public/dbeaver-ce-${DBEAVER_VERSION}-x86_64-setup.exe \
-    && wget -q https://download.jumpserver.org/public/python-${PYTHON_VERSION}-amd64.exe
+COPY --from=static /opt/download /opt/download
 
 WORKDIR /opt
 
-ARG VERSION=v3.8.2
+ARG VERSION=v3.9.0
 ENV VERSION=${VERSION}
 
 RUN set -ex \