diff --git a/allinone/Dockerfile b/allinone/Dockerfile index 0f2466d..3c2389e 100644 --- a/allinone/Dockerfile +++ b/allinone/Dockerfile @@ -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 \ @@ -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 diff --git a/chen/Dockerfile b/chen/Dockerfile index 5775a01..a1fdc43 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.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 \ diff --git a/koko/Dockerfile b/koko/Dockerfile index 01dbbde..b6aee48 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.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 \ diff --git a/lion/Dockerfile b/lion/Dockerfile index 1d8fe1b..d76b840 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.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 \ diff --git a/web/Dockerfile b/web/Dockerfile index 9fd2ff6..3456a92 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -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 .