From ee9687743eb5a062b1b9d4a607c149d2bd73c58a Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 25 Jul 2023 16:59:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=94=81=E5=AE=9A=E4=BE=9D=E8=B5=96=20C?= =?UTF-8?q?ython=3D=3D0.29.35=20--no-build-isolation=20pymssql=3D=3D2.1.5?= =?UTF-8?q?=20(#11063)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 增加 pip 参数 --use-deprecated=legacy-resolver * fix: 升级依赖 pymssql==2.2.7 oracledb==1.2.2 * fix: 升级依赖 git+https://github.com/marcwimmer/pymssql@fix_cython_compiler_version * fix: 锁定依赖 Cython==0.29.22 * fix: 锁定依赖 Cython==0.29.35 --no-build-isolation pymssql==2.1.5 * fix: 锁定依赖 Cython==0.29.35 --no-build-isolation pymssql==2.1.5 * fix: 锁定依赖 * fix: 锁定依赖 * fix: 锁定依赖 * fix: 锁定依赖 * fix: 锁定依赖 --------- Co-authored-by: Bai --- Dockerfile | 4 +++- requirements/requirements.txt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d44290d0..d2d907aa2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,8 +87,10 @@ 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 \ + && pip install --no-build-isolation pymssql \ && pip install $(grep -E 'jms|jumpserver' requirements/requirements.txt) -i ${PIP_JMS_MIRROR} \ - && pip install -r requirements/requirements.txt + && pip install -r requirements/requirements.txt --use-deprecated=legacy-resolver COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver RUN echo > /opt/jumpserver/config.yml \ diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f7c0cc8c8..42ae5f1e5 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -128,9 +128,9 @@ kubernetes==21.7.0 # DB requirements mysqlclient==2.1.0 PyMySQL==1.0.2 -oracledb==1.0.1 +oracledb==1.2.2 psycopg2-binary==2.9.1 -pymssql==2.1.5 +# pymssql==2.2.7 django-mysql==3.9.0 django-redis==5.2.0 python-redis-lock==3.7.0