From 43112eaa8f04fcc086841712971535d323174c52 Mon Sep 17 00:00:00 2001 From: Bryan Date: Tue, 1 Aug 2023 18:23:09 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"perf:=20=E9=94=81=E5=AE=9A=20Cython?= =?UTF-8?q?=3D=3D0.29.35=20=E5=A2=9E=E5=8A=A0=20pip=20=E9=80=89=E9=A1=B9?= =?UTF-8?q?=20--use-deprecated=3Dlegacy-resolver"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9dbbc5745452b09315934a18c6a99089f6c4c50e. --- Dockerfile | 3 +-- Dockerfile-ee | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index adfd39bbd..d8fd27492 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,7 +90,6 @@ RUN --mount=type=cache,target=/root/.cache/pip \ && pip config set global.index-url ${PIP_MIRROR} \ && pip install --upgrade pip \ && pip install --upgrade setuptools wheel \ - && pip install Cython==0.29.35 \ && \ if [ "${TARGETARCH}" == "loong64" ]; then \ pip install https://download.jumpserver.org/pypi/simple/cryptography/cryptography-38.0.4-cp39-cp39-linux_loongarch64.whl; \ @@ -99,7 +98,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \ pip install https://download.jumpserver.org/pypi/simple/grpcio/grpcio-1.54.2-cp39-cp39-linux_loongarch64.whl; \ fi \ && pip install $(grep -E 'jms|jumpserver' requirements/requirements.txt) -i ${PIP_JMS_MIRROR} \ - && pip install -r requirements/requirements.txt --use-deprecated=legacy-resolver + && pip install -r requirements/requirements.txt COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver RUN echo > /opt/jumpserver/config.yml \ diff --git a/Dockerfile-ee b/Dockerfile-ee index e605300a1..63c65d21c 100644 --- a/Dockerfile-ee +++ b/Dockerfile-ee @@ -7,4 +7,4 @@ WORKDIR /opt/jumpserver RUN --mount=type=cache,target=/root/.cache/pip \ set -ex \ - && pip install -r requirements/requirements_xpack.txt --use-deprecated=legacy-resolver + && pip install -r requirements/requirements_xpack.txt