From a0beabc1240e5c46a8ebb7728bebe716bc8b2a99 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Thu, 27 Jun 2024 15:00:58 +0100
Subject: [PATCH] Rebase to 3.20

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

diff --git a/Dockerfile b/Dockerfile
index af31089..0ddc8ca 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
@@ -53,8 +53,9 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r /app/htpcmanager/requirements.txt && \
+  pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/htpcmanager/requirements.txt && \
   echo ${HTPCMANAGER_COMMIT} > /app/htpcmanager/VERSION.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 2c8b6f7..b2fef80 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
@@ -53,8 +53,9 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ -r /app/htpcmanager/requirements.txt && \
+  pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/htpcmanager/requirements.txt && \
   echo ${HTPCMANAGER_COMMIT} > /app/htpcmanager/VERSION.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 ab2fe26..1f2eca7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='8085'
     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 5e61163..c34eda4 100644
--- a/README.md
+++ b/README.md
@@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **27.06.24:** - Rebase to Alpine 3.20.
 * **08.01.24:** - Rebase to Alpine 3.19.
 * **25.08.23:** - Rebase to Alpine 3.18.
 * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 03ff39f..63b410a 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -24,6 +24,6 @@ repo_vars:
   - CI_PORT='8085'
   - 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 c34e314..62266e6 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -10,17 +10,9 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
   - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-# development version
-development_versions: false
-development_versions_items:
-  - {tag: "latest", desc: "Stable Ombi releases"}
-  - {tag: "development", desc: "Releases from the `develop` branch of Ombi"}
 # container parameters
 common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional'
 param_container_name: "{{ project_name }}"
-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" }
@@ -32,6 +24,7 @@ app_setup_block_enabled: true
 app_setup_block: "The webui is found at port 8085. Smartmontools and psutil have not been included, you can safely ignore the warning error in the log."
 # changelog
 changelogs:
+  - {date: "27.06.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "08.01.24:", desc: "Rebase to Alpine 3.19."}
   - {date: "25.08.23:", desc: "Rebase to Alpine 3.18."}
   - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}