dweiss commented on a change in pull request #2197:
URL: https://github.com/apache/lucene-solr/pull/2197#discussion_r556429043
##########
File path: solr/docker/build.gradle
##########
@@ -18,106 +18,187 @@
import com.google.common.base.Preconditions
import com.google.common.base.Strings
-apply plugin: 'base'
-apply plugin: 'com.palantir.docker'
-
-subprojects {
- apply plugin: 'base'
- apply plugin: 'com.palantir.docker'
-}
-
description = 'Solr Docker image'
-def dockerPackage = project(':solr:docker:package')
-
-dependencies {
- docker dockerPackage
-}
+apply plugin: 'base'
+// Solr Docker inputs
def dockerImageRepo = propertyOrEnvOrDefault("solr.docker.imageRepo",
"SOLR_DOCKER_IMAGE_REPO", "apache/solr")
def dockerImageTag = propertyOrEnvOrDefault("solr.docker.imageTag",
"SOLR_DOCKER_IMAGE_TAG", "${version}")
def dockerImageName = propertyOrEnvOrDefault("solr.docker.imageName",
"SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}:${dockerImageTag}")
def baseDockerImage = propertyOrEnvOrDefault("solr.docker.baseImage",
"SOLR_DOCKER_BASE_IMAGE", 'openjdk:11-jre-slim')
def githubUrlOrMirror = propertyOrEnvOrDefault("solr.docker.githubUrl",
"SOLR_DOCKER_GITHUB_URL", 'github.com')
-docker {
- name = dockerImageName
- files file('include')
- buildArgs(['BASE_IMAGE' : baseDockerImage, 'SOLR_PACKAGE_IMAGE' :
'apache/solr-build:local-package', 'SOLR_VERSION': "${version}", 'GITHUB_URL':
githubUrlOrMirror])
+// Build directory locations
+def dockerBuildDistribution = "$buildDir/distributions"
+def imageIdFile = "$buildDir/image-id"
+
+configurations {
+ packaging {
+ canBeResolved = true
+ }
+ dockerImage {
+ canBeResolved = true
+ }
+}
+
+dependencies {
+ packaging project(path: ":solr:packaging", configuration: 'archives')
+
+ dockerImage files(imageIdFile) {
+ builtBy 'dockerBuild'
+ }
+}
+
+task dockerTar(type: Tar) {
+ group = 'Docker'
+ description = 'Package docker context to prepare for docker build'
+
+ dependsOn configurations.packaging
+ into('scripts') {
+ from file('scripts')
+ fileMode 755
+ }
+ into('releases') {
+ from configurations.packaging
+ include '*.tgz'
+ }
+ from file('Dockerfile')
+ destinationDirectory = file(dockerBuildDistribution)
+ extension 'tgz'
+ compression = Compression.GZIP
}
-tasks.docker {
- // In order to create the solr docker image, the solr package image must be
created first.
- dependsOn(dockerPackage.tasks.docker)
+task dockerBuild(dependsOn: tasks.dockerTar) {
+ group = 'Docker'
+ description = 'Build Solr docker image'
+
+ // Ensure that the docker image is rebuilt on build-arg changes or changes
in the docker context
+ inputs.properties([
+ baseDockerImage: baseDockerImage,
+ githubUrlOrMirror: githubUrlOrMirror,
+ version: version
+ ])
+ inputs.dir(dockerBuildDistribution)
+
+ doLast {
+ exec {
+ standardInput =
tasks.dockerTar.outputs.files.singleFile.newDataInputStream()
+ commandLine "docker", "build",
+ "--iidfile", imageIdFile,
+ "--build-arg", "BASE_IMAGE=${inputs.properties.baseDockerImage}",
+ "--build-arg", "SOLR_VERSION=${version}",
+ "--build-arg",
"GITHUB_URL=${inputs.properties.githubUrlOrMirror}",
+ "-"
+ }
+ }
// Print information on the image after it has been created
doLast {
+ def dockerImageId = file(imageIdFile).text
project.logger.lifecycle("Solr Docker Image Created")
- project.logger.lifecycle("\tName: $dockerImageName")
- project.logger.lifecycle("\tBase Image: $baseDockerImage")
+ project.logger.lifecycle("\tID: \t$dockerImageId")
+ project.logger.lifecycle("\tBase Image: \t$baseDockerImage")
+ project.logger.lifecycle("\tSolr Version: \t$version")
}
+
+ outputs.files(imageIdFile)
}
-abstract class DockerTestSuite extends DefaultTask {
- private String solrImageName = null;
- private List<String> tests = new ArrayList<>();
- private List<String> ignore = new ArrayList<>();
+task dockerTag(dependsOn: tasks.dockerBuild) {
+ group = 'Docker'
+ description = 'Tag Solr docker image'
- @OutputDirectory
- abstract DirectoryProperty getOutputDir()
+ // Ensure that the docker image is re-tagged if the image ID or desired tag
changes
+ inputs.properties([
+ dockerImageName: dockerImageName,
+ ])
+ inputs.file(imageIdFile)
- public void setSolrImageName(String solrImageName) {
- this.solrImageName = solrImageName
+ doLast {
+ exec {
+ commandLine "docker", "tag",
tasks.dockerBuild.outputs.files.singleFile.text,
inputs.properties.dockerImageName
+ }
}
- public String getSolrImageName() {
- Preconditions.checkArgument(!Strings.isNullOrEmpty(solrImageName),
"solrImageName is a required dockerTests configuration item.")
- return solrImageName
+ // Print information on the image after it has been created
+ doLast {
+ def dockerImageId = tasks.dockerBuild.outputs.files.singleFile.text
+ project.logger.lifecycle("Solr Docker Image Tagged")
+ project.logger.lifecycle("\tID: \t$dockerImageId")
+ project.logger.lifecycle("\tTag: \t$dockerImageName")
}
+}
- @Option(option = "tests", description = "Only run these specified tests,
comma separated.")
- public void setTests(List<String> tests) {
- this.tests = tests;
- }
+task dockerPush(dependsOn: tasks.dockerTag) {
+ group = 'Docker'
+ description = 'Push Solr docker image'
- @Input
- public List<String> getTests() {
- return tests;
- }
+ // Ensure that the docker image is re-pushed if the image ID or tag changes
+ inputs.properties([
+ dockerImageName: dockerImageName,
+ ])
+ inputs.file(imageIdFile)
- @Option(option = "ignore", description = "Ignore these tests, comma
separated.")
- public void setIgnore(List<String> ignore) {
- this.ignore = ignore;
+ doLast {
+ exec {
+ commandLine "docker", "push", dockerImageName
+ }
}
- @Input
- public List<String> getIgnore() {
- return ignore;
+ // Print information on the image after it has been created
+ doLast {
+ project.logger.lifecycle("Solr Docker Image Pushed: \t$dockerImageName")
}
+}
+
+
+task testDocker(dependsOn: tasks.dockerBuild) {
+ group = 'Docker'
+ description = 'Test Solr docker image'
+
+ def inputDir = "tests/cases"
+ def outputDir = "$buildDir/tmp/tests"
+
+ // Ensure that the docker image is re-tested if the image ID changes or the
test files change
+ inputs.properties([
Review comment:
Does this work with complex types (if they're serializable)? I thought
they need to be properties (string key-value pairs).
##########
File path: gradle/help.gradle
##########
@@ -30,7 +30,7 @@ configure(rootProject) {
["Git", "help/git.txt", "Git assistance and guides."],
["ValidateLogCalls", "help/validateLogCalls.txt", "How to use logging
calls efficiently."],
["IDEs", "help/IDEs.txt", "IDE support."],
- ["Docker", "help/docker.txt", "Building Solr Docker images."],
Review comment:
Do you think it makes sense to scatter those help files? I see some
benefits of keeping them in one place.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org
