This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new f7b20a3 SOLR-15949: Docker, use Java 17 (#556)
f7b20a3 is described below
commit f7b20a375d3c4634f3d3e58cc734ec134ec8b095
Author: David Smiley <[email protected]>
AuthorDate: Mon Feb 14 01:06:37 2022 -0500
SOLR-15949: Docker, use Java 17 (#556)
Specifically eclipse-temurin:17-jre
Co-authored-by: Jan Høydahl <[email protected]>
---
solr/CHANGES.txt | 5 +++--
solr/docker/build.gradle | 2 +-
solr/docker/gradle-help.txt | 2 +-
.../modules/upgrade-notes/pages/major-changes-in-solr-9.adoc | 3 +++
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1ae2d86..f67fc0c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -42,8 +42,6 @@ Other Changes
================== 9.0.0 ==================
-Docker and modules have separate CHANGES.md files.
-
New Features
---------------------
* SOLR-14789: Migrate docker image creation from docker-solr repo to
solr/docker. (Houston Putman, Martijn Koster, Tim Potter, David Smiley, janhoy,
Mike Drob)
@@ -558,6 +556,9 @@ and each individual module's jar will be included in its
directory's lib/ folder
* SOLR-15991: analysis-extras module tests shouldn't rely on log4j dependency
(Kevin Risden)
+* SOLR-15949: Docker: the official image now uses Java 17 provided by Eclipse
Temurin. Formerly it was Java 11 from OpenJDK.
+ (janhoy, David Smiley)
+
Bug Fixes
---------------------
* SOLR-15849: Fix the connection reset problem caused by the incorrect use of
4LW with \n when monitoring zooKeeper status (Fa Ming).
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index a44a92d..0c22327 100644
--- a/solr/docker/build.gradle
+++ b/solr/docker/build.gradle
@@ -27,7 +27,7 @@ apply plugin: 'base'
def dockerImageRepo = propertyOrEnvOrDefault("solr.docker.imageRepo",
"SOLR_DOCKER_IMAGE_REPO", "apache/solr")
def dockerImageTag = propertyOrEnvOrDefault("solr.docker.imageTag",
"SOLR_DOCKER_IMAGE_TAG", "${version}")
def dockerImageName = propertyOrEnvOrDefault("solr.docker.imageName",
"SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}:${dockerImageTag}")
-def baseDockerImage = propertyOrEnvOrDefault("solr.docker.baseImage",
"SOLR_DOCKER_BASE_IMAGE", 'openjdk:11-jre-slim')
+def baseDockerImage = propertyOrEnvOrDefault("solr.docker.baseImage",
"SOLR_DOCKER_BASE_IMAGE", 'eclipse-temurin:17-jre')
def officialDockerImageName = propertyOrEnvOrDefault("solr.docker.imageName",
"SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}-official:${dockerImageTag}")
def releaseGpgFingerprint =
propertyOrDefault('signing.gnupg.keyName',propertyOrDefault('signing.keyId',''));
diff --git a/solr/docker/gradle-help.txt b/solr/docker/gradle-help.txt
index 83cc439..f60de75 100644
--- a/solr/docker/gradle-help.txt
+++ b/solr/docker/gradle-help.txt
@@ -17,7 +17,7 @@ gradlew dockerBuild
The docker build task accepts the following inputs, all accepted via both
Environment Variables and Gradle Properties.
Base Docker Image: (The docker image used for the "FROM" in the Solr
Dockerfile)
- Default: "openjdk:11-jre-slim"
+ Default: "eclipse-temurin:17-jre"
EnvVar: SOLR_DOCKER_BASE_IMAGE
Gradle Property: -Psolr.docker.baseImage
diff --git
a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
index 97baa64..a64be85 100644
---
a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
+++
b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-9.adoc
@@ -310,3 +310,6 @@ Example has been provided in `sample_techproducts_configs`
to override content-t
* SOLR-15124: Removed three core level admin API endpoints because they are
already registered at the node level
where they really belong: /admin/threads, /admin/properties, /admin/logging
+
+* SOLR-15949: Docker: the official image now uses Java 17 provided by Eclipse
Temurin. Formerly it was Java 11 from OpenJDK.
+(janhoy, David Smiley)
\ No newline at end of file
