From 25f355174eebfbde634bfe5fe81f3285bbdf82ee Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Mon, 24 Jun 2024 20:17:28 +0100
Subject: [PATCH] Rebase to 3.20

---
 Dockerfile         |  4 +++-
 Dockerfile.aarch64 |  4 +++-
 Jenkinsfile        |  4 ++--
 README.md          |  5 +++--
 jenkins-vars.yml   |  4 ++--
 readme-vars.yml    | 10 ++++++----
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 489a7aa..78adc0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:latest as unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -24,6 +24,7 @@ RUN \
     py3-chardet \
     py3-idna \
     py3-openssl \
+    py3-setuptools \
     py3-urllib3 \
     python3 && \
   echo "**** install app ****" && \
@@ -38,6 +39,7 @@ RUN \
     "https://github.com/pymedusa/Medusa/archive/${MEDUSA_RELEASE}.tar.gz" && \
   tar xf /tmp/medusa.tar.gz -C \
     /app/medusa --strip-components=1 && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** clean up ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index ebf32e5..a295226 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -24,6 +24,7 @@ RUN \
     py3-chardet \
     py3-idna \
     py3-openssl \
+    py3-setuptools \
     py3-urllib3 \
     python3 && \
   echo "**** install app ****" && \
@@ -38,6 +39,7 @@ RUN \
     "https://github.com/pymedusa/Medusa/archive/${MEDUSA_RELEASE}.tar.gz" && \
   tar xf /tmp/medusa.tar.gz -C \
     /app/medusa --strip-components=1 && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** clean up ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/Jenkinsfile b/Jenkinsfile
index 62edf78..3108afa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='8081'
     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 85af3ee..c2e6672 100644
--- a/README.md
+++ b/README.md
@@ -59,9 +59,9 @@ The architectures supported by this image are:
 
 ## Application Setup
 
-Web interface is at `<your ip>:8081`. 
+"Web interface is at `<your ip>:8081`.
 
-Set paths for downloads, tv-shows to match docker mappings via the webui, for more information check out [Medusa](https://pymedusa.com/).
+Set paths for downloads, tv-shows to match docker mappings via the webui, for more information check out [Medusa](https://pymedusa.com/)."
 
 ## Usage
 
@@ -279,6 +279,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **24.06.24:** - Rebase to Alpine 3.20.
 * **08.01.24:** - Rebase to Alpine 3.19.
 * **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
 * **10.08.23:** - Bump unrar to 6.2.10.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 6b16258..893ec39 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -24,6 +24,6 @@ repo_vars:
   - CI_PORT='8081'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
index c6f9b1d..10ab739 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -18,14 +18,16 @@ param_volumes:
 param_usage_include_ports: true
 param_ports:
   - {external_port: "8081", internal_port: "8081", port_desc: "The port for the Medusa webui"}
-param_usage_include_env: true
-param_env_vars:
-  - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use e.g. Europe/London"}
 # application setup block
 app_setup_block_enabled: true
-app_setup_block: "Web interface is at `<your ip>:8081`. \n\nSet paths for downloads, tv-shows to match docker mappings via the webui, for more information check out [{{ project_name|capitalize }}]({{ project_url }}).\n"
+app_setup_block: |
+  "Web interface is at `<your ip>:8081`.
+
+  Set paths for downloads, tv-shows to match docker mappings via the webui, for more information check out [{{ project_name|capitalize }}]({{ project_url }})."
+
 # changelog
 changelogs:
+  - {date: "24.06.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "08.01.24:", desc: "Rebase to Alpine 3.19."}
   - {date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
   - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}