From 9cb8f4c1b1bd14a1a5dc26c100d7197cec59442f Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 20 Mar 2024 23:12:16 +0000
Subject: [PATCH 1/3] Rebase to 3.19

---
 Dockerfile         |  4 ++--
 Dockerfile.aarch64 |  4 ++--
 readme-vars.yml    | 19 ++++---------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 61b885b..51675f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
@@ -70,7 +70,7 @@ RUN \
   mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig && \
   rm -rf /tmp/daapd-build/var
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine:3.19
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 99aaca9..c6d824b 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
@@ -70,7 +70,7 @@ RUN \
   mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig && \
   rm -rf /tmp/daapd-build/var
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
 
 # set version label
 ARG BUILD_DATE
diff --git a/readme-vars.yml b/readme-vars.yml
index a801444..5b826d2 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -19,27 +19,15 @@ param_container_name: "{{ project_name }}"
 param_usage_include_net: true
 param_net: "host"
 param_net_desc: "Shares host networking with container."
-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/data", desc: "Where daapd server stores its config and dbase files."}
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Where daapd server stores its config and dbase files."}
   - {vol_path: "/music", vol_host_path: "/path/to/music", desc: "Map to your music folder."}
-param_usage_include_ports: false
-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: |
-  Map your music folder, open up itunes on the same LAN to see your music there.
+  Map your music folder, open up iTunes on the same LAN to see your music there.
 
   The web interface is available at `http://<your ip>:3689`
 
@@ -58,6 +46,7 @@ app_setup_block: |
   It is recommended to set the `pipe_autostart` option to `true` in your forked-daapd config.
 # changelog
 changelogs:
+  - {date: "20.03.24:", desc: "Rebase to Alpine 3.19."}
   - {date: "25.08.23:", desc: "Rebase to Alpine 3.18, remove abandoned libspotify libs."}
   - {date: "05.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "23.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}

From 82b8309fb65482fba4e196c35f00412afb936267 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 20 Mar 2024 23:51:01 +0000
Subject: [PATCH 2/3] Add libgnutls

---
 Dockerfile         | 1 +
 Dockerfile.aarch64 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 51675f0..a8b106b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,6 +88,7 @@ RUN \
     json-c \
     libevent \
     libgcrypt \
+    libgnutls \
     libplist \
     libsodium \
     libunistring \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c6d824b..f6174ec 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -88,6 +88,7 @@ RUN \
     json-c \
     libevent \
     libgcrypt \
+    libgnutls \
     libplist \
     libsodium \
     libunistring \

From a5b02f932273b906be9929c3a282505c94394c91 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Thu, 21 Mar 2024 00:03:56 +0000
Subject: [PATCH 3/3] Add correct package

---
 Dockerfile         | 2 +-
 Dockerfile.aarch64 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a8b106b..1806095 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -85,10 +85,10 @@ RUN \
     confuse \
     dbus \
     ffmpeg \
+    gnutls \
     json-c \
     libevent \
     libgcrypt \
-    libgnutls \
     libplist \
     libsodium \
     libunistring \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index f6174ec..0ce8696 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -85,10 +85,10 @@ RUN \
     confuse \
     dbus \
     ffmpeg \
+    gnutls \
     json-c \
     libevent \
     libgcrypt \
-    libgnutls \
     libplist \
     libsodium \
     libunistring \