Merge pull request #186 from jumpserver/dev

fix: 修正工作目录错误
jumpserver · Sep 22, 2023 · 6baef65 · 6baef65
2 parents 89c76c4 + b122060
commit 6baef65
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/allinone/Dockerfile b/allinone/Dockerfile
@@ -89,7 +89,7 @@ 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 /opt/jumpserver/Dockerfile-ee /opt/jumpserver/poetry.lock /opt/jumpserver/pyproject.toml \
     && rm -rf /opt/jumpserver/.git /opt/jumpserver/.github
 
 WORKDIR /opt/jumpserver
@@ -300,6 +300,8 @@ RUN --mount=type=cache,target=/root/.cache \
 ARG VERSION=v3.7.0
 ENV VERSION=${VERSION}
 
+WORKDIR /opt
+
 RUN set -ex \
     && mkdir -p /opt/koko \
     && wget -q https://github.com/jumpserver/koko/releases/download/${VERSION}/koko-${VERSION}-linux-${TARGETARCH}.tar.gz \