From d8a6a45fd621239afffe7f2fb8c3107dfa44eb7b Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Sun, 29 Oct 2023 13:18:15 +0000
Subject: [PATCH] Bump JRE to 17 for v3

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

diff --git a/Dockerfile b/Dockerfile
index e89f68c..b2bf532 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,17 +15,17 @@ RUN \
     unzip && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    openjdk8-jre-base && \
+    openjdk17-jre-headless && \
   echo "**** install ubooquity ****" && \
   if [ -z ${UBOOQUITY_VERSION+x} ]; then \
-    UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null http://vaemendis.net/ubooquity/service/download.php \
+    UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null https://vaemendis.net/ubooquity/service/download.php \
     | sed 's|.*Ubooquity-\([0-9\.]*\).zip|\1|'); \
   fi && \
   mkdir -p \
     /app/ubooquity && \
   curl -o \
   /tmp/ubooquity.zip -L \
-    "http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \
+    "https://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \
   unzip /tmp/ubooquity.zip -d /app/ubooquity && \
   echo "**** cleanup ****" && \
   apk del --purge \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 59ae458..51f7d9d 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -15,17 +15,17 @@ RUN \
     unzip && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    openjdk8-jre-base && \
+    openjdk17-jre-headless && \
   echo "**** install ubooquity ****" && \
   if [ -z ${UBOOQUITY_VERSION+x} ]; then \
-    UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null http://vaemendis.net/ubooquity/service/download.php \
+    UBOOQUITY_VERSION=$(curl -IsL -w %{url_effective} -o /dev/null https://vaemendis.net/ubooquity/service/download.php \
     | sed 's|.*Ubooquity-\([0-9\.]*\).zip|\1|'); \
   fi && \
   mkdir -p \
     /app/ubooquity && \
   curl -o \
   /tmp/ubooquity.zip -L \
-    "http://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \
+    "https://vaemendis.net/ubooquity/downloads/Ubooquity-${UBOOQUITY_VERSION}.zip" && \
   unzip /tmp/ubooquity.zip -d /app/ubooquity && \
   echo "**** cleanup ****" && \
   apk del --purge \
diff --git a/README.md b/README.md
index 18f8322..d784bbe 100644
--- a/README.md
+++ b/README.md
@@ -317,6 +317,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.10.23:** - Bump JRE to 17 to support v3.
 * **12.07.23:** - Rebase to Alpine 3.18.
 * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **05.03.23:** - Rebase to Alpine 3.17.
diff --git a/readme-vars.yml b/readme-vars.yml
index af9f44a..4072652 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -61,6 +61,7 @@ app_setup_block: |
   If no value is set it will default to 512MB.
 # changelog
 changelogs:
+  - {date: "29.10.23:", desc: "Bump JRE to 17 to support v3."}
   - {date: "12.07.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)"}
   - {date: "05.03.23:", desc: "Rebase to Alpine 3.17."}