Skip to content

Commit

Permalink
feat: Update v3.10.4
Browse files Browse the repository at this point in the history
  • Loading branch information
fit2bot committed Mar 6, 2024
1 parent dc5e392 commit 1e9f3f7
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion allinone/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM redis:7.0-bookworm as redis
FROM jumpserver/guacd:1.5.3-bookworm as guacd
FROM jumpserver/web-static:v1.0.6-bookworm as static
FROM jumpserver/jms_core:v3.10.3
FROM jumpserver/jms_core:v3.10.4
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 @@ -91,7 +91,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.10.3
jumpserver/jms_all:v3.10.4
```

**升级**
Expand All @@ -107,7 +107,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.3
docker pull jumpserver/jms_all:v3.10.4

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

WORKDIR /opt/chen

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
ENV VERSION=${VERSION}

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

WORKDIR /opt/chen

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
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.3
VERSION=v3.10.4

# 构建参数, 支持 amd64
TARGETARCH=amd64
Expand Down
4 changes: 2 additions & 2 deletions core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN set -ex \
&& chmod 755 /usr/local/bin/check \
&& rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
ENV VERSION=$VERSION

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

WORKDIR /opt/jumpserver

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
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 @@ -33,7 +33,7 @@ RUN set -ex \

WORKDIR /opt/kael

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
ENV VERSION=${VERSION}

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

WORKDIR /opt/kael

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
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 @@ -74,7 +74,7 @@ RUN set -ex \

WORKDIR /opt/koko

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
ENV VERSION=${VERSION}

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

WORKDIR /opt/koko

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
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 @@ -25,7 +25,7 @@ RUN set -ex \

WORKDIR /opt/lion

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
ENV VERSION=${VERSION}

RUN set -ex \
Expand Down Expand Up @@ -62,7 +62,7 @@ COPY lion/supervisord.conf /etc/supervisor/conf.d/lion.conf

WORKDIR /opt/lion

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
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 @@ -33,7 +33,7 @@ RUN set -ex \

WORKDIR /opt/magnus

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
ENV VERSION=${VERSION}

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

WORKDIR /opt/magnus

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
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 @@ -24,7 +24,7 @@ RUN set -ex \
&& chmod 755 /usr/local/bin/check \
&& rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
ENV VERSION=${VERSION}

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

WORKDIR /opt

ARG VERSION=v3.10.3
ARG VERSION=v3.10.4
ENV VERSION=${VERSION}

VOLUME /var/log/nginx
Expand Down

0 comments on commit 1e9f3f7

Please sign in to comment.