From 7cbad04d759d11276679736c14c6afd5ff6c9343 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Mon, 18 Nov 2024 17:57:12 -0500
Subject: [PATCH] rely on upstream python packages instead of pip install

---
 Dockerfile         | 17 ++---------------
 Dockerfile.aarch64 | 17 ++---------------
 README.md          |  1 +
 readme-vars.yml    |  1 +
 4 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 38a5b71f..29b0e916 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,11 +13,6 @@ LABEL maintainer="nemchik,thelamer"
 ENV TAUTULLI_DOCKER=True
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    cargo \
-    python3-dev && \
   echo "**** install packages ****" && \
   apk add --no-cache \
     git \
@@ -41,23 +36,15 @@ RUN \
     pip \
     wheel && \
   pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
-    apscheduler \
-    cryptography \
-    pycryptodomex \
-    pyopenssl && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
-    -r requirements.txt && \
+    -r https://raw.githubusercontent.com/Tautulli/tautulli-baseimage/refs/heads/python3/requirements.txt && \
   echo "**** Hard Coding versioning ****" && \
   echo "${TAUTULLI_COMMIT}" > /app/tautulli/version.txt && \
   echo "nightly" > /app/tautulli/branch.txt && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /tmp/* \
-    $HOME/.cache \
-    $HOME/.cargo
+    $HOME/.cache
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 75a78d27..5305bd07 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -13,11 +13,6 @@ LABEL maintainer="nemchik,thelamer"
 ENV TAUTULLI_DOCKER=True
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    cargo \
-    python3-dev && \
   echo "**** install packages ****" && \
   apk add --no-cache \
     git \
@@ -41,23 +36,15 @@ RUN \
     pip \
     wheel && \
   pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
-    apscheduler \
-    cryptography \
-    pycryptodomex \
-    pyopenssl && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
-    -r requirements.txt && \
+    -r https://raw.githubusercontent.com/Tautulli/tautulli-baseimage/refs/heads/python3/requirements.txt && \
   echo "**** Hard Coding versioning ****" && \
   echo "${TAUTULLI_COMMIT}" > /app/tautulli/version.txt && \
   echo "nightly" > /app/tautulli/branch.txt && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
     /tmp/* \
-    $HOME/.cache \
-    $HOME/.cargo
+    $HOME/.cache
 
 # add local files
 COPY root/ /
diff --git a/README.md b/README.md
index a7bb3638..8ca5eded 100644
--- a/README.md
+++ b/README.md
@@ -288,6 +288,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.11.24:** - Use upstream python packages.
 * **01.06.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
diff --git a/readme-vars.yml b/readme-vars.yml
index 8d026028..af83dccb 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -38,6 +38,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "18.11.24:", desc: "Use upstream python packages."}
   - { date: "01.06.24:", desc: "Rebase to Alpine 3.20."}
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }