From a99cda7bc78fc40d2a8533979480ebb33540ddca Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Wed, 2 Dec 2020 11:10:42 +0800 Subject: [PATCH] =?UTF-8?q?build(pip):=20=E9=94=81=E5=AE=9Apip=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20(#5153)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build(pip): 锁定pip版本 --- Dockerfile | 6 +++--- requirements/requirements.txt | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59f615a19..4ce7f521a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,10 +24,10 @@ RUN wget -O /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Cen RUN yum -y install epel-release && \ echo -e "[mysql]\nname=mysql\nbaseurl=${MYSQL_MIRROR}\ngpgcheck=0\nenabled=1" > /etc/yum.repos.d/mysql.repo RUN yum -y install $(cat requirements/rpm_requirements.txt) -RUN pip install --upgrade pip setuptools==49.6.0 wheel -i ${PIP_MIRROR} && \ +RUN pip install --upgrade pip==20.2.4 setuptools==49.6.0 wheel -i ${PIP_MIRROR} && \ pip config set global.index-url ${PIP_MIRROR} -RUN pip install $(grep 'jms' requirements/requirements.txt) -i ${PIP_JMS_MIRROR} -RUN pip install -r requirements/requirements.txt +RUN pip install --no-cache-dir $(grep 'jms' requirements/requirements.txt) -i ${PIP_JMS_MIRROR} +RUN pip install --no-cache-dir -r requirements/requirements.txt COPY --from=stage-build /opt/jumpserver/release/jumpserver /opt/jumpserver RUN mkdir -p /root/.ssh/ && echo -e "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null" > /root/.ssh/config diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8fbaf4cf7..60f78a135 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -53,6 +53,8 @@ Pillow==7.1.0 pyasn1==0.4.8 pycparser==2.19 pycrypto==2.6.1 +pycryptodome==3.9.9 +pycryptodomex==3.9.9 pyotp==2.2.6 PyNaCl==1.2.1 python-dateutil==2.6.1