Skip to content

Commit 4482adf

Browse files
wojiushixiaobaiwojiushixiaobai
committed
feat: 更新 wisp 版本
1 parent fe0a4dd commit 4482adf

File tree

5 files changed

+63
-18
lines changed

5 files changed

+63
-18
lines changed

‎allinone/Dockerfile

+33-8
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,39 @@ RUN set -ex \
2222

2323
WORKDIR /opt
2424

25+
ARG WISP_VERSION=v0.1.22
26+
RUN set -ex \
27+
&& wget https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
28+
&& tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
29+
&& chown root:root /usr/local/bin/wisp \
30+
&& chmod 755 /usr/local/bin/wisp \
31+
&& rm -f /opt/*.tar.gz
32+
33+
ARG MONGOSH_VERSION=2.2.12
34+
RUN set -e \
35+
&& \
36+
case "${TARGETARCH}" in \
37+
amd64) \
38+
wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-x64.tgz \
39+
&& tar -xf mongosh-${MONGOSH_VERSION}-linux-x64.tgz \
40+
&& chown root:root mongosh-${MONGOSH_VERSION}-linux-x64/bin/* \
41+
&& mv mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh /usr/local/bin/ \
42+
&& mv mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh_crypt_v1.so /usr/local/lib/ \
43+
&& rm -rf mongosh-${MONGOSH_VERSION}-linux-x64* \
44+
;; \
45+
arm64|ppc64le|s390x) \
46+
wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}.tgz \
47+
&& tar -xf mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}.tgz \
48+
&& chown root:root mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/* \
49+
&& mv mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/mongosh /usr/local/bin/ \
50+
&& mv mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/mongosh_crypt_v1.so /usr/local/lib/ \
51+
&& rm -rf mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}* \
52+
;; \
53+
*) \
54+
echo "Unsupported architecture: ${TARGETARCH}" \
55+
;; \
56+
esac
57+
2558
ARG HELM_VERSION=v3.15.2
2659
ARG KUBECTL_VERSION=v1.30.2
2760
RUN set -ex \
@@ -37,14 +70,6 @@ RUN set -ex \
3770
&& chown root:root /usr/local/bin/rawhelm /usr/local/bin/rawkubectl \
3871
&& rm -f /opt/*.tar.gz
3972

40-
ARG WISP_VERSION=v0.1.21
41-
RUN set -ex \
42-
&& wget https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
43-
&& tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
44-
&& chown root:root /usr/local/bin/wisp \
45-
&& chmod 755 /usr/local/bin/wisp \
46-
&& rm -f /opt/*.tar.gz
47-
4873
ARG PREFIX_DIR=/opt/guacamole
4974
ENV LD_LIBRARY_PATH=${PREFIX_DIR}/lib
5075
ARG RUNTIME_DEPENDENCIES=" \

‎allinone/entrypoint.sh

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ if [ ! "${LOG_LEVEL}" ]; then
4444
export LOG_LEVEL=ERROR
4545
fi
4646
sed -i "s@root: INFO@root: ${LOG_LEVEL}@g" /opt/chen/config/application.yml
47-
sed -i "s@endpoint: .*@endpoint: http://localhost:8080@g" /opt/chen/config/application.yml
4847
sed -i "s@address: static://127.0.0.1:9090@address: static://127.0.0.1:9092@g" /opt/chen/config/application.yml
4948

5049
if [ -f "/etc/init.d/cron" ]; then

‎chen/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN set -e \
2424
&& chmod 755 /usr/local/bin/check \
2525
&& rm -f /opt/*.tar.gz
2626

27-
ARG WISP_VERSION=v0.1.21
27+
ARG WISP_VERSION=v0.1.22
2828
RUN set -e \
2929
&& wget --quiet https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
3030
&& tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \

‎koko/Dockerfile

+28-7
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN set -e \
2525
&& chmod 755 /usr/local/bin/check \
2626
&& rm -f /opt/*.tar.gz
2727

28-
ARG WISP_VERSION=v0.1.21
28+
ARG WISP_VERSION=v0.1.22
2929
RUN set -e \
3030
&& wget --quiet https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
3131
&& tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \
@@ -41,6 +41,31 @@ RUN set -e \
4141
&& chmod 755 /usr/local/bin/usql \
4242
&& rm -f /opt/*.tar.gz
4343

44+
ARG MONGOSH_VERSION=2.2.12
45+
RUN set -e \
46+
&& \
47+
case "${TARGETARCH}" in \
48+
amd64) \
49+
wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-x64.tgz \
50+
&& tar -xf mongosh-${MONGOSH_VERSION}-linux-x64.tgz \
51+
&& chown root:root mongosh-${MONGOSH_VERSION}-linux-x64/bin/* \
52+
&& mv mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh /usr/local/bin/ \
53+
&& mv mongosh-${MONGOSH_VERSION}-linux-x64/bin/mongosh_crypt_v1.so /usr/local/lib/ \
54+
&& rm -rf mongosh-${MONGOSH_VERSION}-linux-x64* \
55+
;; \
56+
arm64|ppc64le|s390x) \
57+
wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}.tgz \
58+
&& tar -xf mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}.tgz \
59+
&& chown root:root mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/* \
60+
&& mv mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/mongosh /usr/local/bin/ \
61+
&& mv mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}/bin/mongosh_crypt_v1.so /usr/local/lib/ \
62+
&& rm -rf mongosh-${MONGOSH_VERSION}-linux-${TARGETARCH}* \
63+
;; \
64+
*) \
65+
echo "Unsupported architecture: ${TARGETARCH}" \
66+
;; \
67+
esac
68+
4469
ARG HELM_VERSION=v3.15.2
4570
ARG KUBECTL_VERSION=v1.30.2
4671
RUN set -e \
@@ -77,12 +102,7 @@ FROM debian:bookworm-slim
77102
ENV LANG=en_US.UTF-8
78103

79104
ARG DEPENDENCIES=" \
80-
bash-completion \
81-
ca-certificates \
82-
libssl-dev \
83-
mariadb-client \
84-
openssh-client \
85-
postgresql-client"
105+
ca-certificates"
86106

87107
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
88108
--mount=type=cache,target=/var/lib/apt,sharing=locked \
@@ -98,6 +118,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
98118

99119
COPY --from=stage-1 /usr/local/bin/redis-cli /usr/local/bin/redis-cli
100120
COPY --from=stage-2 /usr/local/bin /usr/local/bin
121+
COPY --from=stage-2 /usr/local/lib /usr/local/lib
101122
COPY --from=stage-2 /opt/koko /opt/koko
102123
COPY --from=stage-2 /opt/kubectl-aliases /opt/kubectl-aliases
103124

‎lion/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN set -e \
2424
&& chmod 755 /usr/local/bin/check \
2525
&& rm -f /opt/*.tar.gz
2626

27-
ARG WISP_VERSION=v0.1.21
27+
ARG WISP_VERSION=v0.1.22
2828
RUN set -e \
2929
&& wget --quiet https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \
3030
&& tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \

0 commit comments

Comments
 (0)