change dep order; fix armv7

pannal · Dec 5, 2021 · 864e924 · 864e924
1 parent 9b5a933
commit 864e924
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,9 @@ WORKDIR /app
 # Add Kitana files not filtered by .dockerignore to the image
 COPY . .
 
+# still meh. do we want to drop armv7?
+ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
+
 # We chain the following steps to create a single layer, reducing image size
 # - Install packages needed to run and compile
 # - Install and compile required Python packgages
@@ -16,7 +19,7 @@ RUN apk add -U --repository=http://dl-cdn.alpinelinux.org/alpine/v3.13/main \
     libstdc++ \
     && pip install --trusted-host pypi.python.org -r requirements.txt \
     && apk del -r --purge \
-    gcc g++ musl-dev openssl-dev libffi-dev python3-dev cargo build-base \
+    gcc g++ musl-dev openssl-dev libffi-dev cargo build-base \
     && rm /var/cache/apk/*
 
 # Expose the port

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+cryptography<3.5
 cherrypy==18.6.1
 requests==2.26.0
 xmltodict==0.12.0
@@ -7,5 +8,4 @@ PyGithub==1.55
 furl==2.1.3
 ndg-httpsclient==0.5.1
 certifi==2021.10.8
-cffi==1.15.0
-cryptography<3.5
+cffi==1.15.0