From f459235b21392c7a24d77f086c33a800c19d6737 Mon Sep 17 00:00:00 2001 From: fit2bot Date: Thu, 20 Jun 2024 09:46:52 +0800 Subject: [PATCH] feat: Update v3.10.11 --- README.md | 2 +- README_EN.md | 2 +- allinone/Dockerfile | 2 +- allinone/README.md | 6 +++--- chen/Dockerfile | 4 ++-- config_example.conf | 2 +- core/Dockerfile | 4 ++-- kael/Dockerfile | 4 ++-- koko/Dockerfile | 4 ++-- lion/Dockerfile | 4 ++-- magnus/Dockerfile | 4 ++-- web/Dockerfile | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index bfd7f2a..9b5ed9c 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ vi .env ``` ```vim # 版本号可以自己根据项目的版本修改 -VERSION=v3.10.7 +VERSION=v3.10.11 # 构建参数, 支持 amd64/arm64/loong64 TARGETARCH=amd64 diff --git a/README_EN.md b/README_EN.md index cc286a3..4e66f8d 100644 --- a/README_EN.md +++ b/README_EN.md @@ -56,7 +56,7 @@ vi .env ``` ```vim # You can modify the version number according to the project version -VERSION=v3.10.7 +VERSION=v3.10.11 # Build parameters, support amd64/arm64/loong64 TARGETARCH=amd64 diff --git a/allinone/Dockerfile b/allinone/Dockerfile index 2661473..c0a406e 100644 --- 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.10 +FROM jumpserver/jms_core:v3.10.11 ARG TARGETARCH ARG TOOLS=" \ diff --git a/allinone/README.md b/allinone/README.md index 2b9cb54..f106941 100644 --- 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.10 + 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.10 +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.10 + jumpserver/jms_all:v3.10.11 diff --git a/chen/Dockerfile b/chen/Dockerfile index eb5bf70..62ec6c8 100644 --- a/chen/Dockerfile +++ b/chen/Dockerfile @@ -35,7 +35,7 @@ RUN set -e \ WORKDIR /opt/chen -ARG VERSION=v3.10.10 +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.10 +ARG VERSION=v3.10.11 ENV VERSION=${VERSION} VOLUME /opt/chen/data diff --git a/config_example.conf b/config_example.conf index 582663d..53a1ce3 100644 --- a/config_example.conf +++ b/config_example.conf @@ -1,5 +1,5 @@ # 版本号可以自己根据项目的版本修改 -VERSION=v3.10.10 +VERSION=v3.10.11 # 构建参数, 支持 amd64 TARGETARCH=amd64 diff --git a/core/Dockerfile b/core/Dockerfile index 32f6ba4..11833cb 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -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.10 +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.10 +ARG VERSION=v3.10.11 ENV VERSION=${VERSION} VOLUME /opt/jumpserver/data diff --git a/kael/Dockerfile b/kael/Dockerfile index f07f5ee..b3f04c5 100644 --- a/kael/Dockerfile +++ b/kael/Dockerfile @@ -35,7 +35,7 @@ RUN set -e \ WORKDIR /opt/kael -ARG VERSION=v3.10.10 +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.10 +ARG VERSION=v3.10.11 ENV VERSION=${VERSION} VOLUME /opt/kael/data diff --git a/koko/Dockerfile b/koko/Dockerfile index f0ca504..6adb88e 100644 --- a/koko/Dockerfile +++ b/koko/Dockerfile @@ -84,7 +84,7 @@ RUN set -e \ WORKDIR /opt/koko -ARG VERSION=v3.10.10 +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.10 +ARG VERSION=v3.10.11 ENV VERSION=${VERSION} VOLUME /opt/koko/data diff --git a/lion/Dockerfile b/lion/Dockerfile index 0a04399..3fdab43 100644 --- a/lion/Dockerfile +++ b/lion/Dockerfile @@ -35,7 +35,7 @@ RUN set -e \ WORKDIR /opt/lion -ARG VERSION=v3.10.10 +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.10 +ARG VERSION=v3.10.11 ENV VERSION=${VERSION} VOLUME /opt/lion/data diff --git a/magnus/Dockerfile b/magnus/Dockerfile index 400709f..4c115c3 100644 --- a/magnus/Dockerfile +++ b/magnus/Dockerfile @@ -35,7 +35,7 @@ RUN set -e \ WORKDIR /opt/magnus -ARG VERSION=v3.10.10 +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.10 +ARG VERSION=v3.10.11 ENV VERSION=${VERSION} VOLUME /opt/magnus/data diff --git a/web/Dockerfile b/web/Dockerfile index 6005698..02ca84d 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -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.10 +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.10 +ARG VERSION=v3.10.11 ENV VERSION=${VERSION} VOLUME /opt/download