Merge pull request #131 from linuxserver/nightly-cargo

fix up py cryptography builds, clean cache
linuxserver · Feb 24, 2021 · 8250b1c · 8250b1c
2 parents bd1c63d + e72fd23
commit 8250b1c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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/ /