Skip to content

Commit

Permalink
Merge pull request #243 from jumpserver/dev
Browse files Browse the repository at this point in the history 
feat: 更新 web-static 版本
  • Loading branch information
@wojiushixiaobai
wojiushixiaobai authored Sep 9, 2024
2 parents 8d61dd6 + 150f41b commit 99a5ebe
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 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 WISP_VERSION=v0.1.22
ARG WISP_VERSION=v0.2.0
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 Down Expand Up @@ -127,9 +127,9 @@ RUN set -ex \
&& rm -f /opt/*.tar.gz

RUN set -ex \
&& STATIC_VERSION=$(curl -sSL https://github.com/jumpserver/web-static/raw/v3/VERSION) \
&& wget -O /opt/prepare.sh https://github.com/jumpserver/web-static/raw/${STATIC_VERSION}/prepare.sh \
&& chown root:root /opt/prepare.sh \
&& wget https://github.com/jumpserver/docker-web/raw/${VERSION}/prepare.sh \
&& wget https://github.com/jumpserver/docker-web/raw/${VERSION}/versions.txt \
&& chown root:root prepare.sh versions.txt \
&& chmod 755 /opt/prepare.sh

COPY readme.txt readme.txt
Expand Down
2 changes: 1 addition & 1 deletion chen/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN set -e \
&& chmod 755 /usr/local/bin/check \
&& rm -f /opt/*.tar.gz

ARG WISP_VERSION=v0.1.22
ARG WISP_VERSION=v0.2.0
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 koko/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN set -e \
&& chmod 755 /usr/local/bin/check \
&& rm -f /opt/*.tar.gz

ARG WISP_VERSION=v0.1.22
ARG WISP_VERSION=v0.2.0
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 lion/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN set -e \
&& chmod 755 /usr/local/bin/check \
&& rm -f /opt/*.tar.gz

ARG WISP_VERSION=v0.1.22
ARG WISP_VERSION=v0.2.0
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
6 changes: 3 additions & 3 deletions web/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ RUN set -e \
&& rm -f /opt/*.tar.gz

RUN set -e \
&& STATIC_VERSION=$(curl -sSL https://github.com/jumpserver/web-static/raw/v3/VERSION) \
&& wget -O /opt/prepare.sh https://github.com/jumpserver/web-static/raw/${STATIC_VERSION}/prepare.sh \
&& chown root:root /opt/prepare.sh \
&& wget --quiet https://github.com/jumpserver/docker-web/raw/${VERSION}/prepare.sh \
&& wget --quiet https://github.com/jumpserver/docker-web/raw/${VERSION}/versions.txt \
&& chown root:root prepare.sh versions.txt \
&& chmod 755 /opt/prepare.sh

COPY web/entrypoint.sh .
Expand Down

0 comments on commit 99a5ebe

Please sign in to comment.