This is an automated email from the ASF dual-hosted git repository.
houston 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 3ceae7bf85c SOLR-16486: Pin OS Variant for Docker image (#1102)
3ceae7bf85c is described below
commit 3ceae7bf85c3aa292930619e0d1527ce174d22e5
Author: Houston Putman <[email protected]>
AuthorDate: Fri Oct 21 14:13:12 2022 -0400
SOLR-16486: Pin OS Variant for Docker image (#1102)
(cherry picked from commit ed4b3d6f45a5df5e63e25469d96f71f464b46ac5)
---
solr/CHANGES.txt | 4 ++++
solr/docker/build.gradle | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index de15dccddec..18612c89334 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -223,6 +223,8 @@ Bug Fixes
* SOLR-16463: Workaround for serious crash on JDK17+ due to JIT on
caffeinecache (janhoy, Uwe Schindler)
+* SOLR-16478 :removing a replica should delete the PRS entry from the hostnode
and not from overseer (Patson Luk via noble)
+
Other Changes
---------------------
* SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0.
(Dawid Weiss)
@@ -292,6 +294,8 @@ Other Changes
* SOLR-16482: Add an internal envVar for passing options to bin/solr that will
not be overriden by the user. (Houston Putman)
+* SOLR-16486: Pin the OS Variant for the default base image of the Dockerfile
(to Ubuntu 20). (Houston Putman, janhoy, Eva Müller)
+
Build
---------------------
* SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via
Alessandro Benedetti)
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index b7cf405c0fb..0cde9b74dd1 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", project.version) }"
def dockerImageName = "${ -> propertyOrEnvOrDefault("solr.docker.imageName",
"SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}:${dockerImageTag}") }"
-def baseDockerImage = "${ -> propertyOrEnvOrDefault("solr.docker.baseImage",
"SOLR_DOCKER_BASE_IMAGE", 'eclipse-temurin:17-jre') }"
+def baseDockerImage = "${ -> propertyOrEnvOrDefault("solr.docker.baseImage",
"SOLR_DOCKER_BASE_IMAGE", 'eclipse-temurin:17-jre-focal') }"
def officialDockerImageName = "${ ->
propertyOrEnvOrDefault("solr.docker.imageName", "SOLR_DOCKER_IMAGE_NAME",
"${dockerImageRepo}-official:${dockerImageTag}") }"
def releaseGpgFingerprint = "${ ->
propertyOrDefault('signing.gnupg.keyName',propertyOrDefault('signing.keyId',''))
}"
