Skip to content

Commit

Permalink
feat: Update v3.10.12
Browse files Browse the repository at this point in the history
  • Loading branch information
fit2bot committed Jul 12, 2024
1 parent 7ea9275 commit 405ca5c
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ vi .env
```
```vim
# 版本号可以自己根据项目的版本修改
VERSION=v3.10.11
VERSION=v3.10.12
# 构建参数, 支持 amd64, arm64, ppc64le, s390x
TARGETARCH=amd64
Expand Down Expand Up @@ -142,7 +142,7 @@ vi .env
```
```vim
# 版本号可以自己根据项目的版本修改
VERSION=v3.10.10
VERSION=v3.10.12
# 构建参数, 支持 amd64, arm64, ppc64le, s390x
TARGETARCH=amd64
Expand Down
4 changes: 2 additions & 2 deletions README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ vi .env
```
```vim
# You can modify the version number according to the project version
VERSION=v3.10.11
VERSION=v3.10.12
# Build parameters, support amd64, arm64, ppc64le, s390x
TARGETARCH=amd64
Expand Down Expand Up @@ -142,7 +142,7 @@ vi .env
```
```vim
# The version number can be modified according to the version of the project
VERSION=v3.10.10
VERSION=v3.10.12
# Build parameters, support amd64, arm64, ppc64le, s390x
TARGETARCH=amd64
Expand Down
2 changes: 1 addition & 1 deletion allinone/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.11
FROM jumpserver/jms_core:v3.10.12
ARG TARGETARCH

ARG TOOLS=" \
Expand Down
6 changes: 3 additions & 3 deletions allinone/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.11
jumpserver/jms_all:v3.10.12
```

**升级**
Expand All @@ -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.11
docker pull jumpserver/jms_all:v3.10.12

# 删掉旧版本容器
docker rm jms_all
Expand Down Expand Up @@ -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.11
jumpserver/jms_all:v3.10.12
4 changes: 2 additions & 2 deletions chen/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN set -e \

WORKDIR /opt/chen

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

RUN set -e \
Expand Down Expand Up @@ -70,7 +70,7 @@ COPY --from=stage-1 /opt/chen /opt/chen

WORKDIR /opt/chen

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

VOLUME /opt/chen/data
Expand Down
2 changes: 1 addition & 1 deletion config_example.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 版本号可以自己根据项目的版本修改
VERSION=v3.10.11
VERSION=v3.10.12

# 构建参数, 支持 amd64, arm64, ppc64le, s390x
TARGETARCH=amd64
Expand Down
4 changes: 2 additions & 2 deletions core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.11
ARG VERSION=v3.10.12
ENV VERSION=$VERSION

RUN set -e \
Expand Down Expand Up @@ -145,7 +145,7 @@ COPY --from=stage-1 /opt/jumpserver/release/jumpserver /opt/jumpserver

WORKDIR /opt/jumpserver

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

VOLUME /opt/jumpserver/data
Expand Down
4 changes: 2 additions & 2 deletions kael/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN set -e \

WORKDIR /opt/kael

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

RUN set -e \
Expand Down Expand Up @@ -72,7 +72,7 @@ COPY --from=stage-1 /opt/kael /opt/kael

WORKDIR /opt/kael

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

VOLUME /opt/kael/data
Expand Down
4 changes: 2 additions & 2 deletions koko/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN set -e \

WORKDIR /opt/koko

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

RUN set -e \
Expand Down Expand Up @@ -127,7 +127,7 @@ COPY --from=stage-2 /opt/kubectl-aliases /opt/kubectl-aliases

WORKDIR /opt/koko

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

VOLUME /opt/koko/data
Expand Down
4 changes: 2 additions & 2 deletions lion/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN set -e \

WORKDIR /opt/lion

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

RUN set -e \
Expand Down Expand Up @@ -70,7 +70,7 @@ COPY --from=stage-1 /opt/lion /opt/lion

WORKDIR /opt/lion

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

VOLUME /opt/lion/data
Expand Down
4 changes: 2 additions & 2 deletions magnus/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN set -e \

WORKDIR /opt/magnus

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

RUN set -e \
Expand Down Expand Up @@ -69,7 +69,7 @@ COPY --from=stage-1 /opt/magnus /opt/magnus

WORKDIR /opt/magnus

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

VOLUME /opt/magnus/data
Expand Down
4 changes: 2 additions & 2 deletions web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

RUN set -e \
Expand Down Expand Up @@ -71,7 +71,7 @@ COPY web/nginx.conf /etc/nginx/

WORKDIR /opt

ARG VERSION=v3.10.11
ARG VERSION=v3.10.12
ENV VERSION=${VERSION}

VOLUME /opt/download
Expand Down

0 comments on commit 405ca5c

Please sign in to comment.