From 217169da7033d77ec70f844032214a327b949c56 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Mon, 24 Jun 2024 19:51:35 +0100
Subject: [PATCH] Rebase to 3.20

---
 Dockerfile         |  5 +++--
 Dockerfile.aarch64 |  5 +++--
 README.md          |  1 +
 jenkins-vars.yml   |  1 -
 readme-vars.yml    | 23 +----------------------
 5 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ab76627..b2bd7c9 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
@@ -13,7 +13,8 @@ RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \
     bind-tools \
-    logrotate
+    logrotate && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # add local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 093efbe..1b69891 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
@@ -13,7 +13,8 @@ RUN \
   echo "**** install packages ****" && \
   apk add --no-cache \
     bind-tools \
-    logrotate
+    logrotate && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # add local files
 COPY root/ /
diff --git a/README.md b/README.md
index 7d6326c..e24fd39 100644
--- a/README.md
+++ b/README.md
@@ -293,6 +293,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **24.06.24:** - Rebase to Alpine 3.20.
 * **17.06.24:** - Bump CI_DELAY to 120 seconds as ARM builds were failing.
 * **30.03.24:** - Added IP address to logging output when IP changes.
 * **23.12.23:** - Rebase to Alpine 3.19.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 7d8d1d1..437af3d 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,6 @@ external_type: os
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'DUCKDNS_VERSION'
   - LS_USER = 'linuxserver'
diff --git a/readme-vars.yml b/readme-vars.yml
index 348fd26..fe4dea0 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -12,10 +12,6 @@ available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 
-# development version
-development_versions: false
-development_versions_items: ""
-
 # container parameters
 common_param_env_vars_enabled: 'optional' #PGID, PUID, etc, you can set it to 'optional'
 param_container_name: "{{ project_name }}"
@@ -26,14 +22,6 @@ param_usage_include_env: true
 param_env_vars:
   - { env_var: "SUBDOMAINS", env_value: "subdomain1,subdomain2", desc: "multiple subdomains allowed, comma separated, no spaces, if your domain is user.duckdns.org you put user, not a sub-subdomain"}
   - { env_var: "TOKEN", env_value: "token", desc: "DuckDNS token"}
-param_usage_include_vols: false
-param_volumes: ""
-param_usage_include_ports: false
-param_ports: ""
-param_device_map: false
-param_devices: ""
-cap_add_param: false
-cap_add_param_vars: ""
 
 # optional container parameters
 opt_param_usage_include_env: true
@@ -43,16 +31,6 @@ opt_param_env_vars:
 opt_param_usage_include_vols: true
 opt_param_volumes:
   - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files. Also set `LOG_FILE=true` to keep address history." }
-opt_param_usage_include_ports: false
-opt_param_ports: ""
-opt_param_device_map: false
-opt_param_devices: ""
-opt_cap_add_param: false
-opt_cap_add_param_vars: ""
-
-# optional parameters
-optional_block_1: false
-optional_block_1_items: ""
 
 # application setup block
 app_setup_block_enabled: true
@@ -70,6 +48,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "24.06.24:", desc: "Rebase to Alpine 3.20." }
   - { date: "17.06.24:", desc: "Bump CI_DELAY to 120 seconds as ARM builds were failing." }
   - { date: "30.03.24:", desc: "Added IP address to logging output when IP changes." }
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19." }