From f0fea0fe97322f6fa8fbc8267b8714961a3fab91 Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@hashbangbash.com>
Date: Tue, 21 May 2024 19:07:49 -0400
Subject: [PATCH] Dockerfile: update debian, and install jre from download

---
 Dockerfile | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ee81629..b496fab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,30 @@
-FROM debian:9
+FROM r.batts.cloud/debian:bookworm as extract
+COPY jre-8u411-linux-x64.tar.gz /
+RUN mkdir -p /usr/java &&\
+    tar -C /usr/java -xvf jre-8u411-linux-x64.tar.gz
+
+FROM r.batts.cloud/debian:bookworm
 ENV SUBSONIC_VERSION 6.1.6
+ENV JAVA_HOME /usr/java/jre1.8.0_411
+ENV PATH $JAVA_HOME/bin:$PATH
 LABEL description="Subsonic media streamer"
 LABEL version="$SUBSONIC_VERSION"
 
 ## TODO redo with https://github.com/airsonic-advanced/airsonic-advanced/releases/tag/v10.6.0
 
-RUN	apt-get update &&\
-	apt-get -y dist-upgrade &&\
-	apt-get -y install openjdk-8-jre-headless wget ffmpeg lame &&\
+RUN	apt update &&\
+	apt -y dist-upgrade &&\
+	apt -y install --no-install-recommends ffmpeg lame &&\
+	apt clean -y &&\
+	rm -rf /var/lib/apt/lists/* &&\
 	mkdir -p /opt/data/transcode /opt/music/ /opt/playlist/ /opt/podcast/ &&\
 	ln -s /usr/bin/lame /opt/data/transcode/lame &&\
 	ln -s /usr/bin/avconv /opt/data/transcode/ffmpeg &&\
-	wget "https://sourceforge.net/projects/subsonic/files/subsonic/$SUBSONIC_VERSION/subsonic-$SUBSONIC_VERSION-standalone.tar.gz/download" -O subsonic.tar.gz --quiet &&\
+	curl -o subsonic.tar.gz -SL "https://sourceforge.net/projects/subsonic/files/subsonic/$SUBSONIC_VERSION/subsonic-$SUBSONIC_VERSION-standalone.tar.gz/download" &&\
 	mkdir -p /opt/subsonic &&\
 	tar -C /opt/subsonic -xf subsonic.tar.gz &&\
 	rm /subsonic.tar.gz
+COPY --from=extract /usr/java/jre1.8.0_411 /usr/java/jre1.8.0_411
 EXPOSE 4040
 EXPOSE 4043
 VOLUME /opt/data