From 74f7975e6266096f7f05958d8867bfbac1fa732e Mon Sep 17 00:00:00 2001 From: Ben Busby Date: Tue, 21 Feb 2023 14:28:15 -0700 Subject: [PATCH] Split crypto + pyopenssl reqs for armv7 builds Since including rust in the builder stage of the image didn't address the issues with building the cryptography library on armv7, that architecture will just use the last supported version of the affected libraries. May want to revisit this later. --- Dockerfile | 4 +--- requirements.txt | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8299966..09618ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,7 @@ RUN apk --update add \ libxml2-dev \ libxslt-dev \ openssl-dev \ - libffi-dev \ - rust \ - cargo + libffi-dev COPY requirements.txt . diff --git a/requirements.txt b/requirements.txt index d36c9a0..cd553d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,8 @@ certifi==2022.12.7 cffi==1.15.1 chardet==5.1.0 click==8.1.3 -cryptography==39.0.1 +cryptography==3.3.2; platform_machine == 'armv7l' +cryptography==39.0.1; platform_machine != 'armv7l' cssutils==2.6.0 defusedxml==0.7.1 Flask==2.2.3 @@ -19,7 +20,8 @@ packaging==23.0 pluggy==1.0.0 pycodestyle==2.10.0 pycparser==2.21 -pyOpenSSL==23.0.0 +pyOpenSSL==19.1.0; platform_machine == 'armv7l' +pyOpenSSL==23.0.0; platform_machine != 'armv7l' pyparsing==3.0.9 PySocks==1.7.1 pytest==7.2.1