Merge pull request #210 from jumpserver/dev

fix: 修正缺少文件
jumpserver · Dec 29, 2023 · 4639e47 · 4639e47
2 parents 0420441 + b2456ec
commit 4639e47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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