From e72fd23d0e53541055d494165fa91e2e6cb13d63 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 24 Feb 2021 10:54:48 -0500 Subject: [PATCH] fix up py cryptography builds, clean cache --- Dockerfile | 10 ++++++---- Dockerfile.aarch64 | 10 ++++++---- Dockerfile.armhf | 11 +++++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d7d1ad02..2b35cc85f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,9 +42,10 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U -r \ + requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ @@ -64,7 +65,8 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /root/.cache # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 430346dba..947e956c7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -49,9 +49,10 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U -r \ + requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ @@ -78,7 +79,8 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /root/.cache # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b76e3a666..d19bfad49 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -51,9 +51,10 @@ RUN \ /tmp/calibre-web.tar.gz -C \ /app/calibre-web --strip-components=1 && \ cd /app/calibre-web && \ - pip3 install --no-cache-dir -U -r \ - requirements.txt && \ - pip3 install --no-cache-dir -U -r \ + pip3 install --no-cache-dir -U \ + pip && \ + pip install --no-cache-dir -U -r \ + requirements.txt -r \ optional-requirements.txt && \ echo "***install kepubify" && \ if [ -z ${KEPUBIFY_RELEASE+x} ]; then \ @@ -82,7 +83,9 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* \ + /root/.cache \ + /root/.cargo # add local files COPY root/ /