From 5c4336dd30b43edf90d1a2304995521fe80df0db Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Mon, 26 Jan 2026 17:47:45 +0100
Subject: [PATCH 1/2] fix(spark): remove the JRE before installing the JDK

---
 CHANGELOG.md           | 2 ++
 spark-k8s/Dockerfile.3 | 7 +++++--
 spark-k8s/Dockerfile.4 | 7 +++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01a7edb30..14ab94bfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@ All notable changes to this project will be documented in this file.
 - zookeeper: Remove `3.9.3` ([#1401]).
 - trino: Remove `451` and `476` ([#1403]).
 - hbase: Remove `2.6.2` ([#1408]).
+- spark: remove the JRE before installing the JDK to prevent version conflicts ([#1410]).
 
 ### Fixed
 
@@ -87,6 +88,7 @@ All notable changes to this project will be documented in this file.
 [#1406]: https://github.com/stackabletech/docker-images/pull/1406
 [#1408]: https://github.com/stackabletech/docker-images/pull/1408
 [#1409]: https://github.com/stackabletech/docker-images/pull/1409
+[#1410]: https://github.com/stackabletech/docker-images/pull/1410
 
 ## [25.11.0] - 2025-11-07
 
diff --git a/spark-k8s/Dockerfile.3 b/spark-k8s/Dockerfile.3
index bf9be8cb4..65c997561 100644
--- a/spark-k8s/Dockerfile.3
+++ b/spark-k8s/Dockerfile.3
@@ -176,8 +176,6 @@ chmod -R g=u /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/ass
 chmod -R g=u /stackable/jmx
 EOF
 
-# TODO: java-base installs the Adoptium dnf repo and the Termurin jre which is not needed here.
-# To reduce the size of this image, the Adoptium repo could be moved to stackable-base instead.
 FROM local-image/java-base AS final
 
 ARG PRODUCT_VERSION
@@ -218,6 +216,11 @@ COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/licenses /licenses
 RUN <<EOF
 microdnf update
 
+# Remove the JRE that was installed by local-image/java-base.
+# The JRE which is not enough for Spark because some functionality requires the JDK.
+# Also having both JRE and JDK installed causes conflicts with Java 21 because they have slightly different versions in the Adoptium repository.
+microdnf remove "temurin-${JAVA_VERSION}-jre"
+
 # procps:
 #    Required for spark startup scripts.
 # temurin-{version}-jdk:
diff --git a/spark-k8s/Dockerfile.4 b/spark-k8s/Dockerfile.4
index be0fa88d8..5b278530e 100644
--- a/spark-k8s/Dockerfile.4
+++ b/spark-k8s/Dockerfile.4
@@ -150,8 +150,6 @@ chmod -R g=u /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/ass
 chmod -R g=u /stackable/jmx
 EOF
 
-# TODO: java-base installs the Adoptium dnf repo and the Termurin jre which is not needed here.
-# To reduce the size of this image, the Adoptium repo could be moved to stackable-base instead.
 FROM local-image/java-base AS final
 
 ARG PRODUCT_VERSION
@@ -190,6 +188,11 @@ COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/licenses /licenses
 RUN <<EOF
 microdnf update
 
+# Remove the JRE that was installed by local-image/java-base.
+# The JRE which is not enough for Spark because some functionality requires the JDK.
+# Also having both JRE and JDK installed causes conflicts with Java 21 because they have slightly different versions in the Adoptium repository.
+microdnf remove "temurin-${JAVA_VERSION}-jre"
+
 # procps:
 #    Required for spark startup scripts.
 # temurin-{version}-jdk:

From c94e7806d7ed27ebf27426e2dc251e540750335b Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Mon, 26 Jan 2026 17:58:16 +0100
Subject: [PATCH 2/2] english

---
 spark-k8s/Dockerfile.3 | 2 +-
 spark-k8s/Dockerfile.4 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spark-k8s/Dockerfile.3 b/spark-k8s/Dockerfile.3
index 65c997561..71a786516 100644
--- a/spark-k8s/Dockerfile.3
+++ b/spark-k8s/Dockerfile.3
@@ -217,7 +217,7 @@ RUN <<EOF
 microdnf update
 
 # Remove the JRE that was installed by local-image/java-base.
-# The JRE which is not enough for Spark because some functionality requires the JDK.
+# The JRE is not enough for Spark because some functionality requires the JDK.
 # Also having both JRE and JDK installed causes conflicts with Java 21 because they have slightly different versions in the Adoptium repository.
 microdnf remove "temurin-${JAVA_VERSION}-jre"
 
diff --git a/spark-k8s/Dockerfile.4 b/spark-k8s/Dockerfile.4
index 5b278530e..bc61acdaf 100644
--- a/spark-k8s/Dockerfile.4
+++ b/spark-k8s/Dockerfile.4
@@ -189,7 +189,7 @@ RUN <<EOF
 microdnf update
 
 # Remove the JRE that was installed by local-image/java-base.
-# The JRE which is not enough for Spark because some functionality requires the JDK.
+# The JRE is not enough for Spark because some functionality requires the JDK.
 # Also having both JRE and JDK installed causes conflicts with Java 21 because they have slightly different versions in the Adoptium repository.
 microdnf remove "temurin-${JAVA_VERSION}-jre"