From 884651edcd69c5e9efdfc82c052d6f07f6d780d4 Mon Sep 17 00:00:00 2001
From: duncdrum <d.paterson@me.com>
Date: Tue, 12 Nov 2024 13:09:32 +0100
Subject: [PATCH] chore(baseimage): use debian 12

j8 and j11 in deb12 too
---
 Dockerfile     | 2 +-
 Dockerfile_j11 | 6 +++++-
 Dockerfile_j8  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f464cef..a564855 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ mvn -q -DskipTests -Ddocker=false -Ddependency-check.skip=true -Dmac.signing=fal
 
 
 
-FROM gcr.io/distroless/java17:${DISTRO_TAG}
+FROM gcr.io/distroless/java17-debian12:${DISTRO_TAG}
 
 ARG USR=root
 
diff --git a/Dockerfile_j11 b/Dockerfile_j11
index 58683cb..253c24d 100644
--- a/Dockerfile_j11
+++ b/Dockerfile_j11
@@ -36,10 +36,14 @@ mvn -q -DskipTests -Ddocker=false -Ddependency-check.skip=true -Dmac.signing=fal
 
 
 
-FROM gcr.io/distroless/java11-debian11:${DISTRO_TAG}
+FROM gcr.io/distroless/java-base-debian12:${DISTRO_TAG}
 
 ARG USR=root
 
+ENV JAVA_HOME=/opt/java/openjdk
+COPY --from=eclipse-temurin:11-jre --chown=${USR} $JAVA_HOME $JAVA_HOME
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
 # Copy eXist-db
 COPY --from=builder --chown=${USR} /exist/exist-distribution/target/exist-distribution-*-dir/LICENSE /exist/LICENSE
 COPY --from=builder --chown=${USR} /exist/exist-distribution/target/exist-distribution-*-dir/autodeploy /exist/autodeploy
diff --git a/Dockerfile_j8 b/Dockerfile_j8
index d34bae1..b696630 100644
--- a/Dockerfile_j8
+++ b/Dockerfile_j8
@@ -36,7 +36,7 @@ mvn -q -DskipTests -Ddocker=false -Ddependency-check.skip=true -Dmac.signing=fal
 
 
 
-FROM gcr.io/distroless/java-base-debian11:${DISTRO_TAG}
+FROM gcr.io/distroless/java-base-debian12:${DISTRO_TAG}
 
 ARG USR=root