From 836cca4cf4277fbf15df951819a811afe5f325e6 Mon Sep 17 00:00:00 2001
From: Damian Ujma <92095156+damianujma@users.noreply.github.com>
Date: Wed, 15 Oct 2025 15:51:58 +0200
Subject: [PATCH] ACS-10492 Test runtime compatibility with Java 21 and 25
 (#2217)

---
 e2e-test/helpers/java-base-image-map.sh         | 10 ++++++++++
 search-services/packaging/src/docker/Dockerfile |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100755 e2e-test/helpers/java-base-image-map.sh

diff --git a/e2e-test/helpers/java-base-image-map.sh b/e2e-test/helpers/java-base-image-map.sh
new file mode 100755
index 000000000..694605c87
--- /dev/null
+++ b/e2e-test/helpers/java-base-image-map.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+if [ -n "$JAVA_RUNTIME_VERSION" ]; then
+  declare -A JAVA_IMAGE_MAP=(
+    [21]="alfresco/alfresco-base-java:jre21-rockylinux9@sha256:71bbe6f5f7ac280f2c181561f1ba49230673484bb1dd44bbf17499abbf930491"
+    [25]="alfresco/alfresco-base-java:jre25-rockylinux9@sha256:7cc61edc5444e0eb69cfbf5d51716666ab8605fe9c8fdba75407e9484185fcd9"
+  )
+  JAVA_BASE_IMAGE="${JAVA_IMAGE_MAP[$JAVA_RUNTIME_VERSION]}"
+  export JAVA_BASE_IMAGE
+fi
diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile
index 34397756c..072ca1aaa 100644
--- a/search-services/packaging/src/docker/Dockerfile
+++ b/search-services/packaging/src/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Alfresco Search Services ${project.version} Docker Image
 
 # More infos about this image: https://github.com/Alfresco/alfresco-docker-base-java
-FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:1822d68b272c1b34e0877bed3eb04b34c50500cd5e09bdaf345df31cacd59af7
+FROM alfresco/alfresco-base-java:jre17-rockylinux9@sha256:16692e52ef8c3d60606d5c27d95eada9266f9fad8b70f38ad5674a7cbe24e49e
 LABEL creator="Alfresco" maintainer="Alfresco"
 
 ENV DIST_DIR /opt/alfresco-search-services