feat: 更新 v3.10.3

jumpserver · Jan 25, 2024 · 59cd456 · 59cd456
1 parent e589027
commit 59cd456
Show file tree

Hide file tree

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

diff --git a/allinone/Dockerfile b/allinone/Dockerfile
@@ -1,7 +1,7 @@
 FROM redis:7.0-bookworm as redis
 FROM jumpserver/guacd:1.5.3-bookworm as guacd
 FROM jumpserver/web-static:v1.0.6-bookworm as static
-FROM jumpserver/jms_core:v3.10.2
+FROM jumpserver/jms_core:v3.10.3
 ARG TARGETARCH
 
 ARG TOOLS="                           \

diff --git a/allinone/README.md b/allinone/README.md
@@ -103,7 +103,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.10.2
+  jumpserver/jms_all:v3.10.3
 ```
 
 **升级**
@@ -119,7 +119,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.10.2
+docker pull jumpserver/jms_all:v3.10.3
 
 # 删掉旧版本容器
 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.10.2
+  jumpserver/jms_all:v3.10.3
diff --git a/allinone/docker-compose.yml b/allinone/docker-compose.yml
@@ -47,7 +47,6 @@ services:
     environment:
       SECRET_KEY: ${SECRET_KEY:-vYneAbsXUhe4BghEeedNL7nfWLwaTTmhnwQMvjYOIG25Ofzghk}
       BOOTSTRAP_TOKEN: ${BOOTSTRAP_TOKEN:-K1ffDfLSIK8SV2PZj6VaxOiv8KuawlJK}
-      DEBUG: ${DEBUG:-FALSE}
       LOG_LEVEL: ${LOG_LEVEL:-ERROR}
       DB_HOST: ${DB_HOST:-mysql}
       DB_PORT: ${DB_PORT:-3306}

diff --git a/allinone/readme.txt b/allinone/readme.txt
@@ -11,4 +11,4 @@ The Installation is Complete.
   ╚█████╔╝╚██████╔╝██║ ╚═╝ ██║██║     ███████║███████╗██║  ██║ ╚████╔╝ ███████╗██║  ██║
    ╚════╝  ╚═════╝ ╚═╝     ╚═╝╚═╝     ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝
 
-                                                                   VERSION: v3.10.2
+                                                                   VERSION: v3.10.3
diff --git a/allinone/supervisord.conf b/allinone/supervisord.conf
@@ -57,7 +57,7 @@ autorestart=true
 
 [program:chen]
 priority=100
-environment=PATH="/usr/local/openjdk-17/bin:%(ENV_PATH)s", WORK_DIR="/opt/chen", COMPONENT_NAME="chen", WISP_TRACE_PROCESS=1, EXECUTE_PROGRAM="java -Dfile.encoding=utf-8 --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAME -XX:+ExitOnOutOfMemoryError -jar /opt/chen/chen.jar --mock.enable=false", BIND_PORT=9092, LANG=zh_CN.UTF-8
+environment=GIN_MODE="release", WORK_DIR="/opt/chen", COMPONENT_NAME="chen", WISP_TRACE_PROCESS=1, EXECUTE_PROGRAM="java -Dfile.encoding=utf-8 -XX:+ExitOnOutOfMemoryError -jar /opt/chen/chen.jar --mock.enable=false", BIND_PORT=9092, LANG=zh_CN.UTF-8
 directory=/opt/chen/
 command=/usr/local/bin/wisp
 stdout_logfile=/dev/stdout

diff --git a/chen/Dockerfile b/chen/Dockerfile
@@ -33,7 +33,7 @@ RUN set -ex \
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -69,7 +69,7 @@ COPY --from=stage-1 /opt/chen /opt/chen
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 VOLUME /opt/chen/data

diff --git a/chen/entrypoint.sh b/chen/entrypoint.sh
@@ -6,10 +6,11 @@ until /usr/local/bin/check ${CORE_HOST}/api/health/; do
     sleep 2
 done
 
+export GIN_MODE=release
 export WORK_DIR=/opt/chen
 export COMPONENT_NAME=chen
 export WISP_TRACE_PROCESS=1
-export EXECUTE_PROGRAM="java -Dfile.encoding=utf-8 --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAME -XX:+ExitOnOutOfMemoryError -jar /opt/chen/chen.jar --mock.enable=false"
+export EXECUTE_PROGRAM="java -Dfile.encoding=utf-8 -XX:+ExitOnOutOfMemoryError -jar /opt/chen/chen.jar --mock.enable=false"
 
 if [ ! "$LOG_LEVEL" ]; then
     LOG_LEVEL=ERROR

diff --git a/config_example.conf b/config_example.conf
@@ -1,5 +1,5 @@
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.10.2
+VERSION=v3.10.3
 
 # 构建参数, 支持 amd64
 TARGETARCH=amd64
@@ -28,7 +28,7 @@ REDIS_PASSWORD=8URXPL2x3HZMi7xoGTdk3Upj
 # Core
 SECRET_KEY=B3f2w8P2PfxIAS7s4URrD9YmSbtqX4vXdPUL217kL9XPUOWrmy
 BOOTSTRAP_TOKEN=7Q11Vz6R2J6BLAdO
-DEBUG=FALSE
+# DEBUG=FALSE
 LOG_LEVEL=ERROR
 DOMAINS=
 

diff --git a/core/Dockerfile b/core/Dockerfile
@@ -25,7 +25,7 @@ RUN set -ex \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -171,7 +171,7 @@ COPY --from=stage-1 /opt/jumpserver/release/jumpserver /opt/jumpserver
 
 WORKDIR /opt/jumpserver
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 VOLUME /opt/jumpserver/data

diff --git a/kael/Dockerfile b/kael/Dockerfile
@@ -33,7 +33,7 @@ RUN set -ex \
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -63,7 +63,7 @@ COPY --from=stage-1 /opt/kael /opt/kael
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 VOLUME /opt/kael/data

diff --git a/koko/Dockerfile b/koko/Dockerfile
@@ -74,7 +74,7 @@ RUN set -ex \
 
 WORKDIR /opt/koko
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -117,7 +117,7 @@ COPY --from=stage-2 /opt/kubectl-aliases /opt/kubectl-aliases
 
 WORKDIR /opt/koko
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 VOLUME /opt/koko/data

diff --git a/lion/Dockerfile b/lion/Dockerfile
@@ -25,7 +25,7 @@ RUN set -ex \
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -62,7 +62,7 @@ COPY lion/supervisord.conf /etc/supervisor/conf.d/lion.conf
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 VOLUME /opt/lion/data

diff --git a/magnus/Dockerfile b/magnus/Dockerfile
@@ -33,7 +33,7 @@ RUN set -ex \
 
 WORKDIR /opt/magnus
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -68,7 +68,7 @@ COPY --from=stage-1 /opt/magnus /opt/magnus
 
 WORKDIR /opt/magnus
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 VOLUME /opt/magnus/data

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -24,7 +24,7 @@ RUN set -ex \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -64,7 +64,7 @@ COPY web/nginx.conf /etc/nginx/
 
 WORKDIR /opt
 
-ARG VERSION=v3.10.2
+ARG VERSION=v3.10.3
 ENV VERSION=${VERSION}
 
 VOLUME /var/log/nginx