diff --git a/allinone/Dockerfile b/allinone/Dockerfile index c0a406e..e195b7e 100644 --- a/allinone/Dockerfile +++ b/allinone/Dockerfile @@ -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 \ @@ -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 \ @@ -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 \ @@ -76,7 +76,6 @@ ARG RUNTIME_DEPENDENCIES=" \ fonts-dejavu \ fonts-liberation \ ghostscript \ - netcat-openbsd \ xfonts-terminus" COPY --from=guacd ${PREFIX_DIR} ${PREFIX_DIR} diff --git a/allinone/entrypoint.sh b/allinone/entrypoint.sh index 90b659b..a683c20 100755 --- a/allinone/entrypoint.sh +++ b/allinone/entrypoint.sh @@ -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 diff --git a/chen/Dockerfile b/chen/Dockerfile index 62ec6c8..d87b207 100644 --- a/chen/Dockerfile +++ b/chen/Dockerfile @@ -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 \ @@ -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 \ diff --git a/core/Dockerfile b/core/Dockerfile index 11833cb..3c32f2e 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -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 \ diff --git a/kael/Dockerfile b/kael/Dockerfile index b3f04c5..2edcfed 100644 --- a/kael/Dockerfile +++ b/kael/Dockerfile @@ -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 \ @@ -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 \ diff --git a/koko/Dockerfile b/koko/Dockerfile index 6adb88e..b75a0a3 100644 --- a/koko/Dockerfile +++ b/koko/Dockerfile @@ -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 \ @@ -26,7 +26,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 \ @@ -34,7 +34,7 @@ RUN set -e \ && 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 \ @@ -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 \ diff --git a/lion/Dockerfile b/lion/Dockerfile index 3fdab43..0ea9ba8 100644 --- a/lion/Dockerfile +++ b/lion/Dockerfile @@ -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 \ @@ -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 \ diff --git a/magnus/Dockerfile b/magnus/Dockerfile index 4c115c3..8e99646 100644 --- a/magnus/Dockerfile +++ b/magnus/Dockerfile @@ -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 \ @@ -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 \ diff --git a/web/Dockerfile b/web/Dockerfile index 02ca84d..7e2bebc 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -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 \