From 830ecd5677b8a064b3c1cd7888b0db879bfd09ea Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 3 Jul 2022 21:44:40 +1000 Subject: [PATCH] Update package requirements for docker (#3285) * Include cargo / rustc in the docker image - Otherwise cryptography library seems to fail * Revert cryptography lib to older version - New version requires rust, adds ~300MB to the image size! --- Dockerfile | 2 +- requirements.in | 1 + requirements.txt | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ce9b4e6ad..f9d34ec1c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ ENV PYTHONUNBUFFERED 1 # Ref: https://github.com/pyca/cryptography/issues/5776 ENV CRYPTOGRAPHY_DONT_BUILD_RUST 1 -ENV INVENTREE_LOG_LEVEL="INFO" +ENV INVENTREE_LOG_LEVEL="WARNING" ENV INVENTREE_DOCKER="true" # InvenTree paths diff --git a/requirements.in b/requirements.in index 844ffe6b3b..dde42bbd8f 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,7 @@ # Please keep this list sorted - if you pin a version provide a reason Django<4 # Django package coreapi # API documentation for djangorestframework +cryptography==3.4.8 # Core cryptographic functionality django-allauth # SSO for external providers via OpenID django-allauth-2fa # MFA / 2FA django-cleanup # Automated deletion of old / unused uploaded files diff --git a/requirements.txt b/requirements.txt index cfb733a184..27b5cf7493 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,8 +30,10 @@ coreapi==2.3.3 # via -r requirements.in coreschema==0.0.4 # via coreapi -cryptography==37.0.2 - # via pyjwt +cryptography==3.4.8 + # via + # -r requirements.in + # pyjwt cssselect2==0.6.0 # via weasyprint defusedxml==0.7.1