Skip to content

Commit 5e210f9

Browse files
authored
SOLR-17908 Use Java 25 in Docker image (#3782)
1 parent 4f17dee commit 5e210f9

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

dev-docs/gradle-help/docker.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ gradlew dockerBuild
1717
The docker build task accepts the following inputs, all accepted via both Environment Variables and Gradle Properties.
1818

1919
Base Docker Image: (The docker image used for the "FROM" in the Solr Dockerfile)
20-
Default: "eclipse-temurin:21-jre-noble"
20+
Default: "eclipse-temurin:25-jre-noble"
2121
EnvVar: SOLR_DOCKER_BASE_IMAGE
2222
Gradle Property: -Psolr.docker.baseImage
2323

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ cuvs-lucene = "25.10.0"
7979
cybozulabs-langdetect = "1.1-20120112"
8080
decompose = "3.3.0"
8181
diffplug-spotless = "7.2.1"
82+
dockerfile-baseimage-java = "25"
8283
dropwizard-metrics = "4.2.26"
8384
eclipse-ecj = "3.39.0"
8485
eclipse-jetty = "12.0.27"

solr/docker/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.apache.commons.codec.digest.DigestUtils
2222
description = 'Solr Docker image'
2323

2424
apply plugin: 'base'
25-
def javaVersion = libs.versions.java.min.get()
25+
def javaVersion = libs.versions.dockerfile.baseimage.java.get()
2626
// Solr Docker inputs
2727
def dockerImageSolrDist = "${ -> propertyOrEnvOrDefault("solr.docker.dist", "SOLR_DOCKER_DIST", 'full') }"
2828
def isDistSlim = {String dist -> dist.toLowerCase(Locale.ROOT) == "slim"}

solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Solr upgraded to Jetty 12.x from 10.x as Jetty 10 and 11 have reached end-of-lif
189189

190190
=== Docker
191191

192-
The OS version of the official Docker image and provided Dockerfile has been upgraded to Ubuntu 24 (noble) from Ubuntu 22 (jammy).
192+
The OS version of the official Docker image and provided Dockerfile has been upgraded to Ubuntu 24 (noble) from Ubuntu 22 (jammy). The Docker base image is `eclipse-temurin:25-jre-noble`.
193193

194194
=== Miscellaneous
195195

0 commit comments

Comments
 (0)