Skip to content

Commit

Permalink
feat: 更新依赖版本
Browse files Browse the repository at this point in the history
  • Loading branch information
@wojiushixiaobai
wojiushixiaobai committed Jul 2, 2024
1 parent f459235 commit 3e3b640
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 24 deletions.
9 changes: 4 additions & 5 deletions allinone/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -76,7 +76,6 @@ ARG RUNTIME_DEPENDENCIES=" \
fonts-dejavu \
fonts-liberation \
ghostscript \
netcat-openbsd \
xfonts-terminus"

COPY --from=guacd ${PREFIX_DIR} ${PREFIX_DIR}
Expand Down
6 changes: 2 additions & 4 deletions allinone/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ if [ ! "${DB_HOST}" ] || [ ! "${DB_PORT}" ] || [ ! "${REDIS_HOST}" ] || [ ! "${R
exit 1
fi

while ! nc -z "${DB_HOST}" "${DB_PORT}";
do
until check tcp://${DB_HOST}:${DB_PORT}; do
echo "wait for jms_mysql ${DB_HOST} ready"
sleep 2s
done

while ! nc -z "${REDIS_HOST}" "${REDIS_PORT}";
do
until check tcp://${REDIS_HOST}:${REDIS_PORT}; do
echo "wait for jms_redis ${REDIS_HOST} ready"
sleep 2s
done
Expand Down
4 changes: 2 additions & 2 deletions chen/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion core/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions kael/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions koko/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions lion/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions magnus/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion web/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 3e3b640

Please sign in to comment.