(solr) branch branch_9x updated: Add option for specifying a imageTagSuffix in gradle (#2043)

[houston]

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 1ad2a182bef Add option for specifying a imageTagSuffix in gradle 
(#2043)
1ad2a182bef is described below

commit 1ad2a182bef156a9bd4a0017aff5c5e922653687
Author: Houston Putman <hous...@apache.org>
AuthorDate: Mon Oct 30 09:54:26 2023 -0400

    Add option for specifying a imageTagSuffix in gradle (#2043)
    
    (cherry picked from commit db0de927a2356151cc5aea7de8672120b46483fd)
---
 solr/docker/build.gradle    | 7 ++++---
 solr/docker/gradle-help.txt | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index 6bb89252d51..34a51603bc9 100644
--- a/solr/docker/build.gradle
+++ b/solr/docker/build.gradle
@@ -29,11 +29,12 @@ def isDistSlim = {String dist -> 
dist.toLowerCase(Locale.ROOT) == "slim"}
 def isImageSlim = { -> isDistSlim(dockerImageSolrDist) }
 def distToSuffix = {String dist -> isDistSlim(dist) ? "-slim" : ""}
 def dockerImageDistSuffix = "${ -> distToSuffix(dockerImageSolrDist)}"
+def dockerImageTagSuffix = "${ -> 
propertyOrEnvOrDefault("solr.docker.imageTagSuffix", 
"SOLR_DOCKER_IMAGE_TAG_SUFFIX", '')}"
 def dockerImageRepo = "${ -> propertyOrEnvOrDefault("solr.docker.imageRepo", 
"SOLR_DOCKER_IMAGE_REPO", "apache/solr") }"
 def dockerImageTag = "${ -> propertyOrEnvOrDefault("solr.docker.imageTag", 
"SOLR_DOCKER_IMAGE_TAG", project.version + dockerImageDistSuffix) }"
-def dockerImageName = "${ -> propertyOrEnvOrDefault("solr.docker.imageName", 
"SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}:${dockerImageTag}") }"
+def dockerImageName = "${ -> propertyOrEnvOrDefault("solr.docker.imageName", 
"SOLR_DOCKER_IMAGE_NAME", 
"${dockerImageRepo}:${dockerImageTag}${dockerImageTagSuffix}") }"
 def baseDockerImage = "${ -> propertyOrEnvOrDefault("solr.docker.baseImage", 
"SOLR_DOCKER_BASE_IMAGE", 'eclipse-temurin:17-jre-jammy') }"
-def officialDockerImageName = {String dist -> "${ -> 
propertyOrEnvOrDefault("solr.docker.imageName", "SOLR_DOCKER_IMAGE_NAME", 
"${dockerImageRepo}-official:${dockerImageTag}${distToSuffix(dist)}") }" }
+def officialDockerImageName = {String dist -> "${ -> 
propertyOrEnvOrDefault("solr.docker.imageName", "SOLR_DOCKER_IMAGE_NAME", 
"${dockerImageRepo}-official:${dockerImageTag}${distToSuffix(dist)}${dockerImageTagSuffix}")
 }" }
 
 def releaseGpgFingerprint = "${ -> 
propertyOrDefault('signing.gnupg.keyName',propertyOrDefault('signing.keyId',''))
 }"
 
@@ -182,7 +183,7 @@ task dockerBuild() {
     project.logger.lifecycle("\tID: \t${ -> dockerImageId }")
     project.logger.lifecycle("\tBase Image: \t${ -> baseDockerImage }")
     project.logger.lifecycle("\tSolr Version: \t${ -> project.version }")
-    project.logger.lifecycle("\tSolr Distribution: 
\t${dockerImageDistSuffix.isEmpty() ? "Full" : "Slim"}")
+    project.logger.lifecycle("\tSolr Distribution: \t${isImageSlim() ? "Slim" 
: "Full"}")
   }
 
   outputs.files(imageIdFile)
diff --git a/solr/docker/gradle-help.txt b/solr/docker/gradle-help.txt
index 2f4cd114ac5..bd53b6a864d 100644
--- a/solr/docker/gradle-help.txt
+++ b/solr/docker/gradle-help.txt
@@ -47,12 +47,17 @@ Docker Image Repository:
    Gradle Property: -Psolr.docker.imageRepo
 
 Docker Image Tag:
-   Default: the Solr version, e.g. "9.0.0-SNAPSHOT"
+   Default: the Solr version and distribution (if applicable), e.g. 
"9.0.0-SNAPSHOT" or "9.5.0-SNAPSHOT-slim"
    EnvVar: SOLR_DOCKER_IMAGE_TAG
    Gradle Property: -Psolr.docker.imageTag
 
+Docker Image Tag Suffix:
+   Default: None. Example: "-java21"
+   EnvVar: SOLR_DOCKER_IMAGE_TAG_SUFFIX
+   Gradle Property: -Psolr.docker.imageTagSuffix
+
 Docker Image Name: (Use this to explicitly set a whole image name. If given, 
the image repo and image version options above are ignored.)
-   Default: {image_repo}/{image_tag} (both options provided above, with 
defaults)
+   Default: {image_repo}/{image_tag}{image_tag_suffix} (all options provided 
above, with defaults)
    EnvVar: SOLR_DOCKER_IMAGE_NAME
    Gradle Property: -Psolr.docker.imageName