From b2456ec0af946d001e76b62bb9cf060972cbb878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Sat, 30 Dec 2023 01:13:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- allinone/Dockerfile | 3 ++- core/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/allinone/Dockerfile b/allinone/Dockerfile index 507ccf1c..ce52a1ab 100644 --- a/allinone/Dockerfile +++ b/allinone/Dockerfile @@ -29,13 +29,14 @@ 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 \ + && rm -f /opt/jumpserver/Dockerfile-ce \ && rm -rf /opt/jumpserver/.git /opt/jumpserver/.github WORKDIR /opt/jumpserver RUN set -ex \ && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/master/core/Dockerfile-ce \ + && echo > /opt/jumpserver/config.yml \ && cd utils \ && bash -ixeu build.sh diff --git a/core/Dockerfile b/core/Dockerfile index 81b11ca2..46967719 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -25,13 +25,14 @@ 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 \ + && rm -f /opt/jumpserver/Dockerfile-ce \ && rm -rf /opt/jumpserver/.git /opt/jumpserver/.github WORKDIR /opt/jumpserver RUN set -ex \ && wget -q https://github.com/wojiushixiaobai/jumpserver-patch/raw/master/core/Dockerfile-ce \ + && echo > /opt/jumpserver/config.yml \ && cd utils \ && bash -ixeu build.sh