Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use upstream python packages #133

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -40,22 +35,15 @@ RUN \
pip \
wheel && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
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_RELEASE}" > /app/tautulli/version.txt && \
echo "master" > /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/ /
Expand Down
16 changes: 2 additions & 14 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -40,22 +35,15 @@ RUN \
pip \
wheel && \
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
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_RELEASE}" > /app/tautulli/version.txt && \
echo "master" > /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/ /
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **19.11.24:** - Use upstream python packages.
* **24.06.24:** - Rebase to Alpine 3.20.
* **23.12.23:** - Rebase to Alpine 3.19.
* **26.08.23:** - Rebase to Alpine 3.18.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ app_setup_block: |

# changelog
changelogs:
- { date: "19.11.24:", desc: "Use upstream python packages."}
- { date: "24.06.24:", desc: "Rebase to Alpine 3.20."}
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
- { date: "26.08.23:", desc: "Rebase to Alpine 3.18."}
Expand Down