From a1ba1bcb93b1d8541c1b8ea387645b4a795250e8 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 24 Jun 2024 18:50:34 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 7 ++++--- Dockerfile.aarch64 | 7 ++++--- Jenkinsfile | 4 ++-- README.md | 3 ++- jenkins-vars.yml | 5 ++--- readme-vars.yml | 18 ++---------------- 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 240f50d1..5d882c9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -39,15 +39,16 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + 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.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ -r 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 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e6434d2d..88a9e1d2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -39,15 +39,16 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + 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.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ -r 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 && \ diff --git a/Jenkinsfile b/Jenkinsfile index f95560b3..122be214 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='8181' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 6eb01a00..90726fd3 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ This image provides various versions that are available via tags. Please read th ## Application Setup Access the webui at `:8181`, for more information check out [Tautulli](http://tautulli.com). -To use the build-in Plex LogViewer you have to add a volume, preferably ReadOnly. Then in tautulli gui settings, under `Plex Media Server`, turn on `Show Advanced` and set the `Logs Folder` to the folder you mapped. +To use the built-in Plex LogViewer you have to add a volume, preferably Read-Only. Then in Tautulli gui settings, under `Plex Media Server`, turn on `Show Advanced` and set the `Logs Folder` to the folder you mapped. ## Usage @@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.06.24:** - Rebase to Alpine 3.20. * **23.12.23:** - Rebase to Alpine 3.19. * **26.08.23:** - Rebase to Alpine 3.18. * **22.06.23:** - Revert master branch to Alpine 3.17 due to issues with Python 3.11. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e5cea5c0..a979e1a1 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: master -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'Tautulli' @@ -25,8 +24,8 @@ repo_vars: - CI_PORT='8181' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' sponsor_links: - { name: "Tautulli", url: "https://tautulli.com/#donate" } diff --git a/readme-vars.yml b/readme-vars.yml index 47aa595c..ea0a0302 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -5,7 +5,6 @@ project_url: "http://tautulli.com" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/tautulli-icon.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a python based web application for monitoring, analytics and notifications for Plex Media Server." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false # supported architectures available_architectures: @@ -21,35 +20,22 @@ development_versions_items: # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_net: false -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_ports: true param_ports: - { external_port: "8181", internal_port: "8181", port_desc: "WebUI" } -param_device_map: false -cap_add_param: false - -# optional container parameters -opt_param_usage_include_env: false -opt_param_usage_include_vols: false -opt_param_usage_include_ports: false -opt_param_device_map: false -opt_cap_add_param: false -optional_block_1: false # application setup block app_setup_block_enabled: true app_setup_block: | Access the webui at `:8181`, for more information check out [{{ project_name|capitalize }}]({{ project_url }}). - To use the build-in Plex LogViewer you have to add a volume, preferably ReadOnly. Then in tautulli gui settings, under `Plex Media Server`, turn on `Show Advanced` and set the `Logs Folder` to the folder you mapped. + To use the built-in Plex LogViewer you have to add a volume, preferably Read-Only. Then in Tautulli gui settings, under `Plex Media Server`, turn on `Show Advanced` and set the `Logs Folder` to the folder you mapped. # changelog changelogs: + - { 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."} - { date: "22.06.23:", desc: "Revert master branch to Alpine 3.17 due to issues with Python 3.11." }