Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16338: Fix version label for local Docker image (#973)

Houston Putman1e72ab1ab6cd
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index efcae7532eb..18927c36d9e 100644
--- a/solr/docker/build.gradle
+++ b/solr/docker/build.gradle
@@ -269,8 +269,7 @@ ext {
//
// Values identical in both Dockerfiles should use consistent names in both templates and
// be defined in the task creation
-
- 'SOLR_VERSION': version,
+
// NOTE: SHA is lazy computed...
'SOLR_TGZ_SHA': "${ -> checksum(configurations.solrTgz.singleFile) }",
'RELEASE_MANAGER_GPG_FINGERPRINT': "${releaseGpgFingerprint}"
@@ -296,6 +295,7 @@ The final Dockerfiles are merely the snippet headers combined with the snippet b
def props = [
// Values defined here should be common (and consistent) across both Dockerfiles
'BASE_IMAGE': baseDockerImage,
+ 'SOLR_VERSION': version,
* : details.props
]
tasks.create("createDockerfile${details.name}", Copy) {
diff --git a/solr/docker/templates/Dockerfile.local.header.template b/solr/docker/templates/Dockerfile.local.header.template
index 33225e0fb2e..6007ffd3389 100644
--- a/solr/docker/templates/Dockerfile.local.header.template
+++ b/solr/docker/templates/Dockerfile.local.header.template
@@ -42,3 +42,4 @@ FROM $BASE_IMAGE
COPY / /opt/
+ARG SOLR_VERSION="_REPLACE_SOLR_VERSION_"