[solr] branch branch_9_3 updated: Fix gradle workflow for non-signed official images (#1802)

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch branch_9_3
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9_3 by this push:
     new b00d694f406 Fix gradle workflow for non-signed official images (#1802)
b00d694f406 is described below

commit b00d694f4062366de0c948effe135488849fd59e
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Jul 21 17:02:22 2023 -0400

    Fix gradle workflow for non-signed official images (#1802)
    
    (cherry picked from commit 20ea3211ca1ca0c6df0e6a4a3e6f6f0ba66976a9)
---
 solr/distribution/build.gradle |  4 ++--
 solr/docker/build.gradle       | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/solr/distribution/build.gradle b/solr/distribution/build.gradle
index f30e5603b08..d1ad6b62256 100644
--- a/solr/distribution/build.gradle
+++ b/solr/distribution/build.gradle
@@ -59,7 +59,7 @@ configurations {
 
 dependencies {
   changesHtml project(path: ":solr:documentation", configuration: "changesHtml")
-  docker project(path: ':solr:docker', configuration: project.ext.withSignedArtifacts ? 'packagingOfficial' : 'packagingLocal')
+  docker project(path: ':solr:docker', configuration: 'packagingOfficial')
 }
 
 def fullDistTarTask = rootProject.getTasksByName("fullDistTar", true)[0]
@@ -126,7 +126,7 @@ task assembleRelease(type: Sync) {
   })
 
   from(configurations.docker, {
-    include 'Dockerfile.*'
+    include 'Dockerfile.official*'
     into "docker"
   })
 
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index a2c6194e820..4df9b9b525f 100644
--- a/solr/docker/build.gradle
+++ b/solr/docker/build.gradle
@@ -471,13 +471,19 @@ if (''.equals(releaseGpgFingerprint)) {
 
           // *NOW* we can actually run our docker build command...
           logger.lifecycle('Running docker build on Dockerfile.official...');
+          def downloadHost = "mock-downloads.apache.org"
+          // We are not signing, so do not use an apache.org host, as that will check the
+          // GPG signature, which will not be created.
+          if (!project(":solr:distribution").ext.withSignedArtifacts) {
+            downloadHost = "mock-downloads.test.org"
+          }
           exec {
             standardInput = file("${dockerfilesDirPath}/Dockerfile.official-${lowerVariant}").newDataInputStream()
             commandLine 'docker', 'build',
-                '--add-host', "mock-downloads.apache.org:${mockServerIp}",
+                '--add-host', "${downloadHost}:${mockServerIp}",
                 '--no-cache', // force fresh downloads from our current network
                 "--iidfile", imageIdFileOfficial(variant),
-                '--build-arg', "SOLR_DOWNLOAD_SERVER=http://mock-downloads.apache.org:9876",
+                '--build-arg', "SOLR_DOWNLOAD_SERVER=http://${downloadHost}:9876",
                 '--tag', officialDockerImageName(variant),
                 '-'
           }