diff --git a/allinone/Dockerfile b/allinone/Dockerfile index 93c6f22..dcc7416 100644 --- a/allinone/Dockerfile +++ b/allinone/Dockerfile @@ -22,6 +22,39 @@ RUN set -ex \ WORKDIR /opt +ARG WISP_VERSION=v0.1.22 +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 \ + && chown root:root /usr/local/bin/wisp \ + && chmod 755 /usr/local/bin/wisp \ + && rm -f /opt/*.tar.gz + +ARG MONGOSH_VERSION=2.2.12 +RUN set -e \ + && \ + case "${TARGETARCH}" in \ + amd64) \ + wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-x64.tgz \ + && tar -xf mongosh-${MONGOSH_VERSION}-linux-x64.tgz \ + && chown root:root mongosh-${MONGOSH_VERSION}-linux-x64/bin/* \ + && mv mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh /usr/local/bin/ \ + && mv mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh_crypt_v1.so /usr/local/lib/ \ + && rm -rf mongosh-${MONGOSH_VERSION}-linux-x64* \ + ;; \ + arm64|ppc64le|s390x) \ + wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}.tgz \ + && tar -xf mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}.tgz \ + && chown root:root mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/* \ + && mv mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/mongosh /usr/local/bin/ \ + && mv mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/mongosh_crypt_v1.so /usr/local/lib/ \ + && rm -rf mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}* \ + ;; \ + *) \ + echo "Unsupported architecture: ${TARGETARCH}" \ + ;; \ + esac + ARG HELM_VERSION=v3.15.2 ARG KUBECTL_VERSION=v1.30.2 RUN set -ex \ @@ -37,14 +70,6 @@ RUN set -ex \ && chown root:root /usr/local/bin/rawhelm /usr/local/bin/rawkubectl \ && rm -f /opt/*.tar.gz -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 \ - && chown root:root /usr/local/bin/wisp \ - && chmod 755 /usr/local/bin/wisp \ - && rm -f /opt/*.tar.gz - ARG PREFIX_DIR=/opt/guacamole ENV LD_LIBRARY_PATH=${PREFIX_DIR}/lib ARG RUNTIME_DEPENDENCIES=" \ diff --git a/allinone/entrypoint.sh b/allinone/entrypoint.sh index c4e6630..5bdb3f8 100755 --- a/allinone/entrypoint.sh +++ b/allinone/entrypoint.sh @@ -44,7 +44,6 @@ if [ ! "${LOG_LEVEL}" ]; then export LOG_LEVEL=ERROR fi sed -i "s@root: INFO@root: ${LOG_LEVEL}@g" /opt/chen/config/application.yml -sed -i "s@endpoint: .*@endpoint: http://localhost:8080@g" /opt/chen/config/application.yml sed -i "s@address: static://127.0.0.1:9090@address: static://127.0.0.1:9092@g" /opt/chen/config/application.yml if [ -f "/etc/init.d/cron" ]; then diff --git a/chen/Dockerfile b/chen/Dockerfile index 1dadca8..87787ca 100644 --- a/chen/Dockerfile +++ b/chen/Dockerfile @@ -24,7 +24,7 @@ RUN set -e \ && chmod 755 /usr/local/bin/check \ && rm -f /opt/*.tar.gz -ARG WISP_VERSION=v0.1.21 +ARG WISP_VERSION=v0.1.22 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 891eab6..725deba 100644 --- a/koko/Dockerfile +++ b/koko/Dockerfile @@ -25,7 +25,7 @@ RUN set -e \ && chmod 755 /usr/local/bin/check \ && rm -f /opt/*.tar.gz -ARG WISP_VERSION=v0.1.21 +ARG WISP_VERSION=v0.1.22 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 \ @@ -41,6 +41,31 @@ RUN set -e \ && chmod 755 /usr/local/bin/usql \ && rm -f /opt/*.tar.gz +ARG MONGOSH_VERSION=2.2.12 +RUN set -e \ + && \ + case "${TARGETARCH}" in \ + amd64) \ + wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-x64.tgz \ + && tar -xf mongosh-${MONGOSH_VERSION}-linux-x64.tgz \ + && chown root:root mongosh-${MONGOSH_VERSION}-linux-x64/bin/* \ + && mv mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh /usr/local/bin/ \ + && mv mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh_crypt_v1.so /usr/local/lib/ \ + && rm -rf mongosh-${MONGOSH_VERSION}-linux-x64* \ + ;; \ + arm64|ppc64le|s390x) \ + wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}.tgz \ + && tar -xf mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}.tgz \ + && chown root:root mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/* \ + && mv mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/mongosh /usr/local/bin/ \ + && mv mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/mongosh_crypt_v1.so /usr/local/lib/ \ + && rm -rf mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}* \ + ;; \ + *) \ + echo "Unsupported architecture: ${TARGETARCH}" \ + ;; \ + esac + ARG HELM_VERSION=v3.15.2 ARG KUBECTL_VERSION=v1.30.2 RUN set -e \ @@ -77,12 +102,7 @@ FROM debian:bookworm-slim ENV LANG=en_US.UTF-8 ARG DEPENDENCIES=" \ - bash-completion \ - ca-certificates \ - libssl-dev \ - mariadb-client \ - openssh-client \ - postgresql-client" + ca-certificates" RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ @@ -98,6 +118,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ COPY --from=stage-1 /usr/local/bin/redis-cli /usr/local/bin/redis-cli COPY --from=stage-2 /usr/local/bin /usr/local/bin +COPY --from=stage-2 /usr/local/lib /usr/local/lib COPY --from=stage-2 /opt/koko /opt/koko COPY --from=stage-2 /opt/kubectl-aliases /opt/kubectl-aliases diff --git a/lion/Dockerfile b/lion/Dockerfile index 3c69177..60b8143 100644 --- a/lion/Dockerfile +++ b/lion/Dockerfile @@ -24,7 +24,7 @@ RUN set -e \ && chmod 755 /usr/local/bin/check \ && rm -f /opt/*.tar.gz -ARG WISP_VERSION=v0.1.21 +ARG WISP_VERSION=v0.1.22 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 \