feat: 更新 v3.8.2

jumpserver · Nov 13, 2023 · 2645449 · 2645449
1 parent 488d8de
commit 2645449
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ vi .env
 ```
 ```vim
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.8.1
+VERSION=v3.8.2
 
 # 构建参数, 支持 amd64/arm64/loong64
 TARGETARCH=amd64
@@ -87,6 +87,7 @@ SECRET_KEY=B3f2w8P2PfxIAS7s4URrD9YmSbtqX4vXdPUL217kL9XPUOWrmy
 BOOTSTRAP_TOKEN=7Q11Vz6R2J6BLAdO
 DEBUG=FALSE
 LOG_LEVEL=ERROR
+DOMAINS=
 
 # Web
 HTTP_PORT=80

diff --git a/allinone/Dockerfile b/allinone/Dockerfile
@@ -1,5 +1,5 @@
 FROM jumpserver/redis:7.0-buster as redis
-FROM jumpserver/guacd:1.5.2 as guacd
+FROM jumpserver/guacd:1.5.3-buster as guacd
 FROM jumpserver/openjdk:17-slim-buster as openjdk
 FROM jumpserver/python:3.11-slim-buster as get-core
 ARG TARGETARCH
@@ -21,7 +21,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG VERSION=v3.8.1
+ARG VERSION=v3.8.2
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -163,7 +163,7 @@ COPY --from=get-core /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml
 
 WORKDIR /opt/jumpserver
 
-ENV PYTHONUNBUFFERED=1 \
+ARG PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1
 
 RUN --mount=type=cache,target=/root/.cache \
@@ -225,6 +225,12 @@ RUN set -ex \
         amd64|arm64) \
             echo "deb https://nginx.org/packages/debian/ buster nginx" > /etc/apt/sources.list.d/nginx.list \
             && wget -qO - https://nginx.org/keys/nginx_signing.key | apt-key add - \
+            && apt-get update \
+            ;; \
+        loongarch64) \
+            echo "deb https://download.jumpserver.org/nginx/packages/debian buster nginx" > /etc/apt/sources.list.d/nginx.list \
+            && wget -qO - https://download.jumpserver.org/nginx/packages/keys/nginx_signing.key | apt-key add - \
+            && apt-get update \
             ;; \
         *) \
             echo "Unsupported architecture: ${dpkgArch}" \
@@ -331,7 +337,7 @@ 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
 
-ARG VERSION=v3.8.1
+ARG VERSION=v3.8.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.8.1
+  jumpserver/jms_all:v3.8.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.8.1
+docker pull jumpserver/jms_all:v3.8.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.8.1
+  jumpserver/jms_all:v3.8.2
diff --git a/allinone/docker-compose.yml b/allinone/docker-compose.yml
@@ -60,6 +60,7 @@ services:
       MAGNUS_MYSQL_PORT: ${MAGNUS_MYSQL_PORT:-33061}
       MAGNUS_MARIADB_PORT: ${MAGNUS_MARIADB_PORT:-33062}
       MAGNUS_REDIS_PORT: ${MAGNUS_REDIS_PORT:-63790}
+      DOMAINS: ${DOMAINS:-}
     ports:
       - ${HTTP_PORT:-80}:80/tcp
       - ${SSH_PORT:-2222}:2222/tcp

diff --git a/allinone/entrypoint.sh b/allinone/entrypoint.sh
@@ -3,7 +3,7 @@
 action="${1}"
 
 if [[ "$action" == "bash" || "$action" == "sh" ]]; then
-    bash
+    bash "${@}"
     exit 0
 fi
 

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

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

diff --git a/core/Dockerfile b/core/Dockerfile
@@ -1,5 +1,3 @@
-FROM jumpserver/redis:7.0 as redis
-FROM jumpserver/guacd:1.5.2 as guacd
 FROM jumpserver/python:3.11-slim-buster as get-core
 ARG TARGETARCH
 
@@ -20,7 +18,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG VERSION=v3.8.1
+ARG VERSION=v3.8.2
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -110,7 +108,7 @@ COPY --from=get-core /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml
 
 WORKDIR /opt/jumpserver
 
-ENV PYTHONUNBUFFERED=1 \
+ARG PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1
 
 RUN --mount=type=cache,target=/root/.cache \
@@ -161,7 +159,7 @@ RUN set -ex \
 COPY --from=build-core /opt/py3 /opt/py3
 COPY --from=get-core /opt/jumpserver/release/jumpserver /opt/jumpserver
 
-ARG VERSION=v3.8.1
+ARG VERSION=v3.8.2
 ENV VERSION=${VERSION}
 
 WORKDIR /opt/jumpserver

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

diff --git a/lion/Dockerfile b/lion/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/guacd:1.5.2
+FROM jumpserver/guacd:1.5.3-buster
 ARG TARGETARCH
 ENV LANG=zh_CN.UTF-8
 
@@ -26,7 +26,7 @@ RUN set -ex \
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.8.1
+ARG VERSION=v3.8.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.8.1
+ARG VERSION=v3.8.2
 ENV VERSION=${VERSION}
 
 RUN set -ex \

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -24,7 +24,7 @@ RUN set -ex \
 
 WORKDIR /opt/download/public
 
-ARG Client_VERSION=v2.0.1
+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
@@ -43,7 +43,7 @@ RUN set -ex \
 
 WORKDIR /opt/download/applets
 
-ARG TINKER_VERSION=v0.1.0
+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
@@ -57,7 +57,7 @@ RUN set -ex \
 
 WORKDIR /opt
 
-ARG VERSION=v3.8.1
+ARG VERSION=v3.8.2
 ENV VERSION=${VERSION}
 
 RUN set -ex \
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     action="${1}"
     if [[ "$action" == "bash" || "$action" == "sh" ]]; then
-        bash
+        bash "${@}"
         exit 0
     fi
@@ Expand Down @@