perf: feat: 更新 v3.9.3

jumpserver · Nov 28, 2023 · f877e46 · f877e46
1 parent 21b3065
commit f877e46
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ vi .env
 ```
 ```vim
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.9.2
+VERSION=v3.9.3
 
 # 构建参数, 支持 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.2
+ARG VERSION=v3.9.3
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -106,7 +106,7 @@ RUN set -ex \
         cd /opt/rust-install && ./install.sh; \
         cd /opt && rm -rf /opt/rust-install /opt/rust.tar.gz; \
         mkdir -p ${CARGO_HOME:-$HOME/.cargo}; \
-        echo -e '[source.crates-io]\nreplace-with = "ustc"\n\n[source.ustc]\nregistry = "sparse+https://mirrors.ustc.edu.cn/crates.io-index/"' > ${CARGO_HOME:-$HOME/.cargo}/config; \
+        echo -e '[source.crates-io]\nreplace-with = "ustc"\n\n[source.ustc]\nregistry = "sparse+https://mirrors.tuna.tsinghua.edu.cn/crates.io-index/"' > ${CARGO_HOME:-$HOME/.cargo}/config; \
     fi
 
 COPY --from=get-core /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml /opt/jumpserver/
@@ -116,6 +116,8 @@ WORKDIR /opt/jumpserver
 ARG PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1
 
+ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+
 RUN --mount=type=cache,target=/root/.cache \
     set -ex \
     && python3 -m venv /opt/py3 \
@@ -287,7 +289,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.2
+ARG VERSION=v3.9.3
 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.2
+  jumpserver/jms_all:v3.9.3
 ```
 
 **升级**
@@ -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.2
+docker pull jumpserver/jms_all:v3.9.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.9.2
+  jumpserver/jms_all:v3.9.3
diff --git a/allinone/readme.txt b/allinone/readme.txt
@@ -11,4 +11,4 @@ The Installation is Complete.
   ╚█████╔╝╚██████╔╝██║ ╚═╝ ██║██║     ███████║███████╗██║  ██║ ╚████╔╝ ███████╗██║  ██║
    ╚════╝  ╚═════╝ ╚═╝     ╚═╝╚═╝     ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝
 
-                                                                   VERSION: v3.9.2
+                                                                   VERSION: v3.9.3
diff --git a/chen/Dockerfile b/chen/Dockerfile
@@ -51,7 +51,7 @@ RUN set -ex \
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.9.2
+ARG VERSION=v3.9.3
 ENV VERSION=${VERSION}
 
 RUN set -ex \

diff --git a/config_example.conf b/config_example.conf
@@ -1,5 +1,5 @@
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.9.2
+VERSION=v3.9.3
 
 # 构建参数, 支持 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.2
+ARG VERSION=v3.9.3
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -103,7 +103,7 @@ RUN set -ex \
         cd /opt/rust-install && ./install.sh; \
         cd /opt && rm -rf /opt/rust-install /opt/rust.tar.gz; \
         mkdir -p ${CARGO_HOME:-$HOME/.cargo}; \
-        echo -e '[source.crates-io]\nreplace-with = "ustc"\n\n[source.ustc]\nregistry = "sparse+https://mirrors.ustc.edu.cn/crates.io-index/"' > ${CARGO_HOME:-$HOME/.cargo}/config; \
+        echo -e '[source.crates-io]\nreplace-with = "ustc"\n\n[source.ustc]\nregistry = "sparse+https://mirrors.tuna.tsinghua.edu.cn/crates.io-index/"' > ${CARGO_HOME:-$HOME/.cargo}/config; \
     fi
 
 COPY --from=stage-1 /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml /opt/jumpserver/
@@ -113,6 +113,8 @@ WORKDIR /opt/jumpserver
 ARG PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1
 
+ENV GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+
 RUN --mount=type=cache,target=/root/.cache \
     set -ex \
     && python3 -m venv /opt/py3 \
@@ -166,7 +168,7 @@ COPY --from=stage-1 /opt/jumpserver/release/jumpserver /opt/jumpserver
 
 WORKDIR /opt/jumpserver
 
-ARG VERSION=v3.9.2
+ARG VERSION=v3.9.3
 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.2
+ARG VERSION=v3.9.3
 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.2
+ARG VERSION=v3.9.3
 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.2
+ARG VERSION=v3.9.3
 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.2
+ARG VERSION=v3.9.3
 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.2
+ARG VERSION=v3.9.3
 ENV VERSION=${VERSION}
 
 RUN set -ex \