From 0fbd50bc3289897ebfc00c14ea040df1f74104ab Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Fri, 24 May 2024 15:00:35 +0100
Subject: [PATCH] Rebase to 3.20

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

diff --git a/Dockerfile b/Dockerfile
index 9fc472b..3b31614 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
 
 # set version label
 ARG BUILD_DATE
@@ -44,7 +44,7 @@ RUN \
   rm -rf \
     /tmp/*
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
 
 ARG BUILD_DATE
 ARG VERSION
@@ -76,6 +76,7 @@ RUN \
   yarn --production --frozen-lockfile && \
   yarn cache clean && \
   npm install -g serve && \
+  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 7dd5be0..25d4677 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
 
 # set version label
 ARG BUILD_DATE
@@ -44,7 +44,7 @@ RUN \
   rm -rf \
     /tmp/*
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
 
 ARG BUILD_DATE
 ARG VERSION
@@ -76,6 +76,7 @@ RUN \
   yarn --production --frozen-lockfile && \
   yarn cache clean && \
   npm install -g serve && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/README.md b/README.md
index c8c451c..76e144a 100644
--- a/README.md
+++ b/README.md
@@ -288,6 +288,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **24.05.24:** - Rebase to Alpine 3.20.
 * **02.03.24:** - Updates for changes in 1.8.0. Initial DB migration may take several minutes.
 * **24.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
 * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
diff --git a/readme-vars.yml b/readme-vars.yml
index 5fa8a36..8374bed 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -18,9 +18,6 @@ development_versions: false
 
 # container parameters
 param_container_name: "{{ project_name }}"
-param_usage_include_vols: false
-
-opt_param_usage_include_vols: false
 
 param_usage_include_ports: true
 param_ports:
@@ -34,8 +31,6 @@ param_env_vars:
   - { env_var: "SPOTIFY_SECRET", env_value: "", desc: "Your Spotify application secret."}
   - { env_var: "CORS", env_value: "http://localhost:80,https://localhost:443", desc: "Allowed CORS sources, set to `all` to allow any source."}
   - { env_var: "MONGO_ENDPOINT", env_value: "mongodb://mongo:27017/your_spotify", desc: "Set mongodb endpoint address/port."}
-# optional env variables
-opt_param_usage_include_env: false
 
 # application setup block
 app_setup_block_enabled: true
@@ -48,6 +43,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "24.05.24:", desc: "Rebase to Alpine 3.20." }
   - { date: "02.03.24:", desc: "Updates for changes in 1.8.0. Initial DB migration may take several minutes." }
   - { date: "24.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}