Apache Solr open-source search software
SOLR-16665: Upgrade the base docker iamge to Ubuntu 22 (Jammy) (#1365)
Houston Putman257054a47ea4
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 560b8383263..04127aeff38 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -146,6 +146,8 @@ Improvements* SOLR-11029: A v2 equivalent of the `/admin/collections?action=DELETENODE` command is now available at`POST /api/cluster/nodes/nodeName/clear`. (Bence Szabo via Jason Gerlowski)+* SOLR-16665: The base docker image has been upgraded from Ubuntu 20 (Focal) to Ubuntu 22 (Jammy). (Houston Putman)+Optimizations---------------------diff --git a/solr/docker/build.gradle b/solr/docker/build.gradleindex 0cde9b74dd1..5a0ce4c9316 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-focal') }"+def baseDockerImage = "${ -> propertyOrEnvOrDefault("solr.docker.baseImage", "SOLR_DOCKER_BASE_IMAGE", 'eclipse-temurin:17-jre-jammy') }"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.txtindex f60de752974..61faa3400c6 100644--- a/solr/docker/gradle-help.txt+++ b/solr/docker/gradle-help.txt@@ -17,7 +17,7 @@ gradlew dockerBuildThe 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: "eclipse-temurin:17-jre"+ Default: "eclipse-temurin:17-jre-jammy"EnvVar: SOLR_DOCKER_BASE_IMAGEGradle Property: -Psolr.docker.baseImagediff --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.adocindex 27268ace1b6..ae82eda4901 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@@ -79,6 +79,9 @@ The `server/contexts/solr-jetty-context.xml` now explicitly removes these restriAt the same time, the `jaegertracer-configurator` module is deprecated for removal in Solr 10.Users should start migrating to the new module to prepare for a smooth transition.+=== Docker+* The OS version of the official Docker image and provided Dockerfile has been upgraded to Ubuntu 22 (jammy) from Ubuntu 20 (focal).+== Solr 9.1.1* Solr no longer accepts all file types for configSets. Please see xref:configuration-guide:config-sets.adoc#forbidden-file-types[ConfigSet Forbidden File Types] for more information.