NOTICK: Refactor Gradle script for building Docker images. (#5813)

This commit is contained in:
Chris Rankin 2019-12-16 14:34:51 +00:00 committed by Matthew Nesbit
parent 4a35b99283
commit 5d47466051

View File

@ -14,22 +14,8 @@ apply plugin: 'com.bmuschko.docker-remote-api'
mainClassName = 'net.corda.core.ConfigExporterMain' mainClassName = 'net.corda.core.ConfigExporterMain'
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
repositories {
maven {
url "${artifactory_contextUrl}/corda-releases"
}
maven {
url "${artifactory_contextUrl}/corda-dev"
}
}
configurations {
artifactoryCorda
}
dependencies{ dependencies{
compile project(':node') compile project(':node')
artifactoryCorda "net.corda:corda:${project.version}"
} }
shadowJar { shadowJar {
@ -48,23 +34,22 @@ docker{
} }
} }
task buildDockerFolder(dependsOn: [":node:capsule:buildCordaJAR", shadowJar]) { final dockerTempDir = file("$buildDir/docker-temp")
doLast {
def cordaJar = configurations.artifactoryCorda.singleFile task buildDockerFolder(type: Copy) {
project.copy { into dockerTempDir
into new File(project.buildDir, "docker-temp") from "src/bash/run-corda.sh"
from "src/bash/run-corda.sh" from(project(':node:capsule').tasks.buildCordaJAR) {
from cordaJar.path rename 'corda-(.*)', 'corda.jar'
from shadowJar.archivePath
from "src/config/starting-node.conf"
from "src/bash/generate-config.sh"
from "src/docker/DockerfileAL"
from "src/docker/Dockerfile"
from "src/docker/Dockerfile11"
rename(cordaJar.name, "corda.jar")
rename(shadowJar.archivePath.name, "config-exporter.jar")
}
} }
from(shadowJar) {
rename 'config-exporter-(.*).jar', 'config-exporter.jar'
}
from "src/config/starting-node.conf"
from "src/bash/generate-config.sh"
from "src/docker/DockerfileAL"
from "src/docker/Dockerfile"
from "src/docker/Dockerfile11"
} }
final String runTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) final String runTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))
@ -73,21 +58,21 @@ final zuluBuildTags = ["corda/corda-zulu-java${JavaVersion.current()}-${project.
final correttoBuildTags = ["corda/corda-corretto-java${JavaVersion.current()}-${project.version.toString().toLowerCase()}:${suffix}", "corda/corda-corretto-java${JavaVersion.current()}-${project.version.toString().toLowerCase()}:latest"] final correttoBuildTags = ["corda/corda-corretto-java${JavaVersion.current()}-${project.version.toString().toLowerCase()}:${suffix}", "corda/corda-corretto-java${JavaVersion.current()}-${project.version.toString().toLowerCase()}:latest"]
task buildOfficialZuluDockerImage(type: DockerBuildImage, dependsOn: [buildDockerFolder]) { task buildOfficialZuluDockerImage(type: DockerBuildImage, dependsOn: [buildDockerFolder]) {
inputDir = new File(project.buildDir, "docker-temp") inputDir = dockerTempDir
tags = zuluBuildTags tags = zuluBuildTags
dockerFile = new File(new File(project.buildDir, "docker-temp"), "Dockerfile") dockerFile = new File(dockerTempDir, "Dockerfile")
} }
task buildOfficialZuluJDK11DockerImage(type: DockerBuildImage, dependsOn: [buildDockerFolder]) { task buildOfficialZuluJDK11DockerImage(type: DockerBuildImage, dependsOn: [buildDockerFolder]) {
inputDir = new File(project.buildDir, "docker-temp") inputDir = dockerTempDir
tags = zuluBuildTags tags = zuluBuildTags
dockerFile = new File(new File(project.buildDir, "docker-temp"), "Dockerfile11") dockerFile = new File(dockerTempDir, "Dockerfile11")
} }
task buildOfficialCorrettoDockerImage(type: DockerBuildImage, dependsOn: [buildDockerFolder]) { task buildOfficialCorrettoDockerImage(type: DockerBuildImage, dependsOn: [buildDockerFolder]) {
inputDir = new File(project.buildDir, "docker-temp") inputDir = dockerTempDir
tags = correttoBuildTags tags = correttoBuildTags
dockerFile = new File(new File(project.buildDir, "docker-temp"), "DockerfileAL") dockerFile = new File(dockerTempDir, "DockerfileAL")
} }
task pushZuluTimeStampedTag('type': DockerPushImage, dependsOn: [buildOfficialZuluDockerImage]){ task pushZuluTimeStampedTag('type': DockerPushImage, dependsOn: [buildOfficialZuluDockerImage]){