Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-14947: Print out image info after gradle docker task. (#2007)

Houston Putman3bfe9d8ac92b
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
index 2557d6c3e19..a4cdeea28e9 100644
--- a/solr/docker/build.gradle
+++ b/solr/docker/build.gradle
@@ -31,14 +31,26 @@ dependencies {
docker dockerPackage
}
+def dockerImageName = "apache/solr:${version}"
+def baseDockerImage = 'openjdk:11-jre-slim'
+
docker {
- name = "apache/solr:${version}"
+ name = dockerImageName
files file('include')
- buildArgs(['BASE_IMAGE' : 'openjdk:11-jre-slim', 'SOLR_PACKAGE_IMAGE' : 'apache/solr-build:local-package', 'SOLR_VERSION': "${version}"])
+ buildArgs(['BASE_IMAGE' : baseDockerImage, 'SOLR_PACKAGE_IMAGE' : 'apache/solr-build:local-package', 'SOLR_VERSION': "${version}"])
}
-// In order to create the solr docker image, the solr package image must be created first.
-tasks.docker.dependsOn(dockerPackage.tasks.docker)
+tasks.docker {
+ // In order to create the solr docker image, the solr package image must be created first.
+ dependsOn(dockerPackage.tasks.docker)
+
+ // Print information on the image after it has been created
+ doLast {
+ project.logger.lifecycle("Solr Docker Image Created")
+ project.logger.lifecycle("\tName: $dockerImageName")
+ project.logger.lifecycle("\tBase Image: $baseDockerImage")
+ }
+}
abstract class DockerTestSuite extends DefaultTask {
private List<String> tests = new ArrayList<>();