Merge branch 'dev' into patch_swarm

jumpserver · Jul 2, 2024 · 4737d54 · 4737d54
2 parents b353f01 + 3e3b640
commit 4737d54
Show file tree

Hide file tree

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

diff --git a/README_EN.md b/README_EN.md
@@ -56,8 +56,8 @@ cp config_example.conf .env
 vi .env
 ```
 ```vim
-# The version number can be modified according to the version of the project
-VERSION=v3.10.10
+# You can modify the version number according to the project version
+VERSION=v3.10.11
 
 # Build parameters, support amd64, arm64, ppc64le, s390x
 TARGETARCH=amd64

diff --git a/allinone/Dockerfile b/allinone/Dockerfile
@@ -1,6 +1,6 @@
 FROM redis:7.0-bookworm as redis
 FROM jumpserver/guacd:1.5.5-bookworm as guacd
-FROM jumpserver/jms_core:v3.10.9
+FROM jumpserver/jms_core:v3.10.11
 ARG TARGETARCH
 
 ARG TOOLS="                           \
@@ -22,7 +22,7 @@ RUN set -ex \
 
 WORKDIR /opt
 
-ARG MONGOSH_VERSION=1.10.6
+ARG MONGOSH_VERSION=2.2.10
 RUN set -ex \
     && \
     case "${TARGETARCH}" in \
@@ -47,8 +47,8 @@ RUN set -ex \
             ;; \
     esac
 
-ARG HELM_VERSION=v3.12.2
-ARG KUBECTL_VERSION=v1.27.4
+ARG HELM_VERSION=v3.15.2
+ARG KUBECTL_VERSION=v1.30.2
 RUN set -ex \
     && wget -O /usr/local/bin/rawkubectl https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl \
     && wget http://download.jumpserver.org/public/kubectl_aliases.tar.gz \
@@ -62,7 +62,7 @@ RUN set -ex \
     && chown root:root /usr/local/bin/rawhelm /usr/local/bin/rawkubectl \
     && rm -f /opt/*.tar.gz
 
-ARG WISP_VERSION=v0.1.20
+ARG WISP_VERSION=v0.1.21
 RUN set -ex \
     && wget https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
@@ -72,6 +72,11 @@ RUN set -ex \
 
 ARG PREFIX_DIR=/opt/guacamole
 ENV LD_LIBRARY_PATH=${PREFIX_DIR}/lib
+ARG RUNTIME_DEPENDENCIES="            \
+        fonts-dejavu                  \
+        fonts-liberation              \
+        ghostscript                   \
+        xfonts-terminus"
 
 COPY --from=guacd ${PREFIX_DIR} ${PREFIX_DIR}
 

diff --git a/allinone/README.md b/allinone/README.md
@@ -93,7 +93,7 @@ docker run --name jms_all -d \
   -v /opt/jumpserver/chen/data:/opt/chen/data \
   -v /opt/jumpserver/web/data/logs:/var/log/nginx \
   -v /opt/jumpserver/web/data/download:/opt/download \
-  jumpserver/jms_all:v3.10.9
+  jumpserver/jms_all:v3.10.11
 ```
 
 **升级**
@@ -109,7 +109,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.9
+docker pull jumpserver/jms_all:v3.10.11
 
 # 删掉旧版本容器
 docker rm jms_all
@@ -138,4 +138,4 @@ docker run --name jms_all -d \
   -v /opt/jumpserver/chen/data:/opt/chen/data \
   -v /opt/jumpserver/web/data/logs:/var/log/nginx \
   -v /opt/jumpserver/web/data/download:/opt/download \
-  jumpserver/jms_all:v3.10.9
+  jumpserver/jms_all:v3.10.11
diff --git a/chen/Dockerfile b/chen/Dockerfile
@@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG CHECK_VERSION=v1.0.2
+ARG CHECK_VERSION=v1.0.3
 RUN set -e \
     && wget --quiet https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
@@ -25,7 +25,7 @@ RUN set -e \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG WISP_VERSION=v0.1.20
+ARG WISP_VERSION=v0.1.21
 RUN set -e \
     && wget --quiet https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
@@ -35,7 +35,7 @@ RUN set -e \
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 RUN set -e \
@@ -70,7 +70,7 @@ COPY --from=stage-1 /opt/chen /opt/chen
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 VOLUME /opt/chen/data

diff --git a/config_example.conf b/config_example.conf
@@ -1,5 +1,5 @@
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.10.10
+VERSION=v3.10.11
 
 # 构建参数, 支持 amd64, arm64, ppc64le, s390x
 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 CHECK_VERSION=v1.0.2
+ARG CHECK_VERSION=v1.0.3
 RUN set -e \
     && wget --quiet https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
@@ -27,7 +27,7 @@ RUN set -e \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=$VERSION
 
 RUN set -e \
@@ -144,7 +144,7 @@ COPY --from=stage-1 /opt/jumpserver/release/jumpserver /opt/jumpserver
 
 WORKDIR /opt/jumpserver
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 VOLUME /opt/jumpserver/data

diff --git a/kael/Dockerfile b/kael/Dockerfile
@@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG CHECK_VERSION=v1.0.2
+ARG CHECK_VERSION=v1.0.3
 RUN set -e \
     && wget --quiet https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
@@ -25,7 +25,7 @@ RUN set -e \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG WISP_VERSION=v0.1.20
+ARG WISP_VERSION=v0.1.21
 RUN set -e \
     && wget --quiet https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
@@ -35,7 +35,7 @@ RUN set -e \
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 RUN set -e \
@@ -72,7 +72,7 @@ COPY --from=stage-1 /opt/kael /opt/kael
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 VOLUME /opt/kael/data

diff --git a/koko/Dockerfile b/koko/Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG CHECK_VERSION=v1.0.2
+ARG CHECK_VERSION=v1.0.3
 RUN set -e \
     && wget --quiet https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
@@ -26,15 +26,15 @@ RUN set -e \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG WISP_VERSION=v0.1.20
+ARG WISP_VERSION=v0.1.21
 RUN set -e \
     && wget --quiet https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
     && chown root:root /usr/local/bin/wisp \
     && chmod 755 /usr/local/bin/wisp \
     && rm -f /opt/*.tar.gz
 
-ARG MONGOSH_VERSION=2.1.1
+ARG MONGOSH_VERSION=2.2.10
 RUN set -e \
     && \
     case "${TARGETARCH}" in \
@@ -65,8 +65,8 @@ RUN set -e \
         ; \
     fi
 
-ARG HELM_VERSION=v3.14.3
-ARG KUBECTL_VERSION=v1.29.3
+ARG HELM_VERSION=v3.15.2
+ARG KUBECTL_VERSION=v1.30.2
 RUN set -e \
     && wget --quiet -O kubectl.tar.gz https://dl.k8s.io/${KUBECTL_VERSION}/kubernetes-client-linux-${TARGETARCH}.tar.gz \
     && tar -xf kubectl.tar.gz --strip-components=3 -C /opt kubernetes/client/bin/kubectl \
@@ -84,7 +84,7 @@ RUN set -e \
 
 WORKDIR /opt/koko
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 RUN set -e \
@@ -127,7 +127,7 @@ COPY --from=stage-2 /opt/kubectl-aliases /opt/kubectl-aliases
 
 WORKDIR /opt/koko
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 VOLUME /opt/koko/data

diff --git a/lion/Dockerfile b/lion/Dockerfile
@@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG CHECK_VERSION=v1.0.2
+ARG CHECK_VERSION=v1.0.3
 RUN set -e \
     && wget --quiet https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
@@ -25,7 +25,7 @@ RUN set -e \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG WISP_VERSION=v0.1.20
+ARG WISP_VERSION=v0.1.21
 RUN set -e \
     && wget --quiet https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
@@ -35,7 +35,7 @@ RUN set -e \
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 RUN set -e \
@@ -70,7 +70,7 @@ COPY --from=stage-1 /opt/lion /opt/lion
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 VOLUME /opt/lion/data

diff --git a/magnus/Dockerfile b/magnus/Dockerfile
@@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG CHECK_VERSION=v1.0.2
+ARG CHECK_VERSION=v1.0.3
 RUN set -e \
     && wget --quiet https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
@@ -25,7 +25,7 @@ RUN set -e \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG WISP_VERSION=v0.1.20
+ARG WISP_VERSION=v0.1.21
 RUN set -e \
     && wget --quiet https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
@@ -35,7 +35,7 @@ RUN set -e \
 
 WORKDIR /opt/magnus
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 RUN set -e \
@@ -69,7 +69,7 @@ COPY --from=stage-1 /opt/magnus /opt/magnus
 
 WORKDIR /opt/magnus
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 VOLUME /opt/magnus/data

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 WORKDIR /opt
 
-ARG CHECK_VERSION=v1.0.2
+ARG CHECK_VERSION=v1.0.3
 RUN set -e \
     && wget --quiet https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
     && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \
@@ -26,7 +26,7 @@ RUN set -e \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 RUN set -e \
@@ -71,7 +71,7 @@ COPY web/nginx.conf /etc/nginx/
 
 WORKDIR /opt
 
-ARG VERSION=v3.10.9
+ARG VERSION=v3.10.11
 ENV VERSION=${VERSION}
 
 VOLUME /opt/download