perf: feat: 更新 v3.9.2

jumpserver · Nov 20, 2023 · d785ef1 · d785ef1
1 parent 453e6da
commit d785ef1
Show file tree

Hide file tree

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

diff --git a/allinone/Dockerfile b/allinone/Dockerfile
@@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG VERSION=v3.9.1
+ARG VERSION=v3.9.2
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -71,7 +71,6 @@ ARG TOOLS="                           \
         default-mysql-client          \
         git                           \
         git-lfs                       \
-        unzip                         \
         xz-utils                      \
         wget"
 
@@ -141,17 +140,15 @@ ARG TOOLS="                           \
         default-libmysqlclient-dev    \
         default-mysql-client          \
         gnupg2                        \
-        inetutils-ping                \
+        iputils-ping                  \
         locales                       \
         netcat                        \
         logrotate                     \
         openssh-client                \
         p11-kit                       \
-        procps                        \
         sshpass                       \
         supervisor                    \
         telnet                        \
-        unzip                         \
         vim                           \
         nmap                          \
         wget"
@@ -290,7 +287,7 @@ COPY --from=build-core /opt/py3 /opt/py3
 COPY --from=get-core /opt/jumpserver/release/jumpserver /opt/jumpserver
 COPY --from=static /opt/download /opt/download
 
-ARG VERSION=v3.9.1
+ARG VERSION=v3.9.2
 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.9.1
+  jumpserver/jms_all:v3.9.2
 ```
 
 **升级**
@@ -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.9.1
+docker pull jumpserver/jms_all:v3.9.2
 
 # 删掉旧版本容器
 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.9.1
+  jumpserver/jms_all:v3.9.2
diff --git a/allinone/entrypoint.sh b/allinone/entrypoint.sh
@@ -56,6 +56,10 @@ if [ -f "/etc/init.d/cron" ]; then
   /etc/init.d/cron start
 fi
 
+if [ "$(uname -m)" = "loongarch64" ]; then
+    export SECURITY_LOGIN_CAPTCHA_ENABLED=False
+fi
+
 cd /opt/jumpserver || exit 1
 ./jms upgrade_db || {
     echo -e "\033[31m Failed to change the table structure. \033[0m"

diff --git a/allinone/readme.txt b/allinone/readme.txt
@@ -11,4 +11,4 @@ The Installation is Complete.
   ╚█████╔╝╚██████╔╝██║ ╚═╝ ██║██║     ███████║███████╗██║  ██║ ╚████╔╝ ███████╗██║  ██║
    ╚════╝  ╚═════╝ ╚═╝     ╚═╝╚═╝     ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝
 
-                                                                   VERSION: v3.9.1
+                                                                   VERSION: v3.9.2
diff --git a/chen/Dockerfile b/chen/Dockerfile
@@ -51,7 +51,7 @@ RUN set -ex \
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.9.1
+ARG VERSION=v3.9.2
 ENV VERSION=${VERSION}
 
 RUN set -ex \

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

diff --git a/core/Dockerfile b/core/Dockerfile
@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG VERSION=v3.9.1
+ARG VERSION=v3.9.2
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -166,7 +166,7 @@ COPY --from=stage-1 /opt/jumpserver/release/jumpserver /opt/jumpserver
 
 WORKDIR /opt/jumpserver
 
-ARG VERSION=v3.9.1
+ARG VERSION=v3.9.2
 ENV VERSION=${VERSION}
 
 VOLUME /opt/jumpserver/data

diff --git a/kael/Dockerfile b/kael/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.9.1
+ARG VERSION=v3.9.2
 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.9.1
+ARG VERSION=v3.9.2
 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.9.1
+ARG VERSION=v3.9.2
 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.9.1
+ARG VERSION=v3.9.2
 ENV VERSION=${VERSION}
 
 RUN set -ex \

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -27,7 +27,7 @@ COPY --from=static /opt/download /opt/download
 
 WORKDIR /opt
 
-ARG VERSION=v3.9.1
+ARG VERSION=v3.9.2
 ENV VERSION=${VERSION}
 
 RUN set -ex \