From 81cb54b6163864b82602f5b2353958be11ed7f16 Mon Sep 17 00:00:00 2001 From: fit2bot Date: Thu, 16 May 2024 17:53:49 +0800 Subject: [PATCH] feat: Update v3.10.10 --- 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 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/allinone/Dockerfile b/allinone/Dockerfile index 8f08cb1..2661473 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.9 +FROM jumpserver/jms_core:v3.10.10 ARG TARGETARCH ARG TOOLS=" \ diff --git a/allinone/README.md b/allinone/README.md index 272ca49..2b9cb54 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.9 + jumpserver/jms_all:v3.10.10 ``` **升级** @@ -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.10 # 删掉旧版本容器 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.10 diff --git a/chen/Dockerfile b/chen/Dockerfile index e0299c0..eb5bf70 100644 --- a/chen/Dockerfile +++ b/chen/Dockerfile @@ -35,7 +35,7 @@ RUN set -e \ WORKDIR /opt/chen -ARG VERSION=v3.10.9 +ARG VERSION=v3.10.10 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.10 ENV VERSION=${VERSION} VOLUME /opt/chen/data diff --git a/config_example.conf b/config_example.conf index 0937345..582663d 100644 --- a/config_example.conf +++ b/config_example.conf @@ -1,5 +1,5 @@ # 版本号可以自己根据项目的版本修改 -VERSION=v3.10.9 +VERSION=v3.10.10 # 构建参数, 支持 amd64 TARGETARCH=amd64 diff --git a/core/Dockerfile b/core/Dockerfile index c99e56b..32f6ba4 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.9 +ARG VERSION=v3.10.10 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.10 ENV VERSION=${VERSION} VOLUME /opt/jumpserver/data diff --git a/kael/Dockerfile b/kael/Dockerfile index f39eb09..f07f5ee 100644 --- a/kael/Dockerfile +++ b/kael/Dockerfile @@ -35,7 +35,7 @@ RUN set -e \ WORKDIR /opt/kael -ARG VERSION=v3.10.9 +ARG VERSION=v3.10.10 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.10 ENV VERSION=${VERSION} VOLUME /opt/kael/data diff --git a/koko/Dockerfile b/koko/Dockerfile index 57a4e92..f0ca504 100644 --- a/koko/Dockerfile +++ b/koko/Dockerfile @@ -84,7 +84,7 @@ RUN set -e \ WORKDIR /opt/koko -ARG VERSION=v3.10.9 +ARG VERSION=v3.10.10 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.10 ENV VERSION=${VERSION} VOLUME /opt/koko/data diff --git a/lion/Dockerfile b/lion/Dockerfile index ae66a7e..0a04399 100644 --- a/lion/Dockerfile +++ b/lion/Dockerfile @@ -35,7 +35,7 @@ RUN set -e \ WORKDIR /opt/lion -ARG VERSION=v3.10.9 +ARG VERSION=v3.10.10 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.10 ENV VERSION=${VERSION} VOLUME /opt/lion/data diff --git a/magnus/Dockerfile b/magnus/Dockerfile index d171738..400709f 100644 --- a/magnus/Dockerfile +++ b/magnus/Dockerfile @@ -35,7 +35,7 @@ RUN set -e \ WORKDIR /opt/magnus -ARG VERSION=v3.10.9 +ARG VERSION=v3.10.10 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.10 ENV VERSION=${VERSION} VOLUME /opt/magnus/data diff --git a/web/Dockerfile b/web/Dockerfile index ad1b184..6005698 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.9 +ARG VERSION=v3.10.10 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.10 ENV VERSION=${VERSION} VOLUME /opt/download