From d2f22424c3d79bee84c242a9f7cad7f1e880642e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Fri, 22 Dec 2023 09:58:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E8=A1=A5=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- allinone/Dockerfile | 5 +---- core/Dockerfile | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/allinone/Dockerfile b/allinone/Dockerfile index a79c0879..6997980d 100644 --- a/allinone/Dockerfile +++ b/allinone/Dockerfile @@ -29,16 +29,13 @@ RUN set -ex \ && git clone -b ${VERSION} --depth=1 https://github.com/jumpserver/jumpserver /opt/jumpserver \ && sed -i "s@VERSION = .*@VERSION = \"${VERSION}\"@g" /opt/jumpserver/apps/jumpserver/const.py \ && chmod +x /opt/jumpserver/entrypoint.sh \ - && rm -f /opt/jumpserver/Dockerfile /opt/jumpserver/Dockerfile-ee /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml \ + && rm -f /opt/jumpserver/Dockerfile \ && rm -rf /opt/jumpserver/.git /opt/jumpserver/.github WORKDIR /opt/jumpserver RUN set -ex \ && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/Dockerfile-ce \ - && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/Dockerfile-ee \ - && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/poetry.lock \ - && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/pyproject.toml \ && cd utils \ && bash -ixeu build.sh diff --git a/core/Dockerfile b/core/Dockerfile index 45941ee0..8f7b61ae 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -25,16 +25,13 @@ RUN set -ex \ && git clone -b ${VERSION} --depth=1 https://github.com/jumpserver/jumpserver /opt/jumpserver \ && sed -i "s@VERSION = .*@VERSION = \"${VERSION}\"@g" /opt/jumpserver/apps/jumpserver/const.py \ && chmod +x /opt/jumpserver/entrypoint.sh \ - && rm -f /opt/jumpserver/Dockerfile /opt/jumpserver/Dockerfile-ee /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml \ + && rm -f /opt/jumpserver/Dockerfile \ && rm -rf /opt/jumpserver/.git /opt/jumpserver/.github WORKDIR /opt/jumpserver RUN set -ex \ && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/Dockerfile-ce \ - && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/Dockerfile-ee \ - && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/poetry.lock \ - && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/${VERSION}/core/pyproject.toml \ && cd utils \ && bash -ixeu build.sh