Merge pull request #72 from linuxserver/master-wheel

Use prebuilt wheels
linuxserver · May 17, 2021 · ca1a6a9 · ca1a6a9
2 parents eca0756 + f76c17e
commit ca1a6a9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,7 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
+    cargo \
     g++ \
     gcc \
     jq \
@@ -46,13 +47,15 @@ RUN \
   rm -Rf /app/bazarr/bin/bin && \
   echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
   echo "**** Install requirements ****" && \
-  pip3 install --no-cache-dir -U  -r \
+  pip3 install -U --no-cache-dir pip && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/  -r \
     /app/bazarr/bin/requirements.txt && \
   echo "**** clean up ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
     /root/.cache \
+    /root/.cargo \
     /tmp/*
 
 # add local files

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -13,6 +13,7 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
+    cargo \
     g++ \
     gcc \
     jq \
@@ -46,13 +47,15 @@ RUN \
   rm -Rf /app/bazarr/bin/bin && \
   echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
   echo "**** Install requirements ****" && \
-  pip3 install --no-cache-dir -U  -r \
+  pip3 install -U --no-cache-dir pip && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/  -r \
     /app/bazarr/bin/requirements.txt && \
   echo "**** clean up ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
     /root/.cache \
+    /root/.cargo \
     /tmp/*
 
 # add local files

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -13,6 +13,7 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
+    cargo \
     g++ \
     gcc \
     jq \
@@ -46,13 +47,15 @@ RUN \
   rm -Rf /app/bazarr/bin/bin && \
   echo "UpdateMethod=docker\nBranch=master\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/bazarr/package_info && \
   echo "**** Install requirements ****" && \
-  pip3 install --no-cache-dir -U  -r \
+  pip3 install -U --no-cache-dir pip && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/  -r \
     /app/bazarr/bin/requirements.txt && \
   echo "**** clean up ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
     /root/.cache \
+    /root/.cargo \
     /tmp/*
 
 # add local files

diff --git a/README.md b/README.md
@@ -238,6 +238,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.05.21:** - Use wheel index.
 * **19.04.21:** - Install from release zip.
 * **07.04.21:** - Move app to /app/bazarr/bin, add `package_info`.
 * **23.01.21:** - Rebasing to alpine 3.13.

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -45,6 +45,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "16.05.21:", desc: "Use wheel index." }
   - { date: "19.04.21:", desc: "Install from release zip." }
   - { date: "07.04.21:", desc: "Move app to /app/bazarr/bin, add `package_info`." }
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }