mirror of
https://github.com/corda/corda.git
synced 2024-12-19 04:57:58 +00:00
6dd33fb8f7
Major changes due to JDK 17: 1. JDK17 JCE Provider now has built-in support for eddsas, corda uses the bouncycastle (i2p) implementation. This PR removes the conflicting algorithms from the built-in JCE provider. 2. JavaScript scripting has been removed from the JDK, the corda log4j config was using scripting to conditionally output additional diagnostic info if the MDC was populated. This PR has removed the scripting. 3. The artifactory plug-ins used are now deprecated, this PR has removed them and uses the same code as Corda 5 for publishing to artifactory. 4. Javadoc generation has been modified to use the latest dokka plug-ins. 5. Gradle 7.6 has implemented an incredibly annoying change where transitive dependencies are not put on the compile classpath, so that they have to be explicitly added as dependencies to projects. 6. Mockito has been updated, which sadly meant that quite a few source files have to changes to use the new (org.mockito.kotlin) package name. This makes this PR appear much larger than it is. 7. A number of tests have been marked as ignored to get a green, broadly they fall into 3 classes. The first is related to crypto keypair tests, it appears some logic in the JDK prefers to use the SunJCE implementation and we prefer to use bouncycastle. I believe this issue can be fixed with better test setup. The second group is related to our use of a method called "uncheckedCast(..)", the purpose of this method was to get rid of the annoying unchecked cast compiler warning that would otherwise exist. It looks like the Kotlin 1.9 compiler type inference differs and at runtime sometimes the type it infers is "Void" which causes an exception at runtime. The simplest solution is to use an explicit cast instead of unchecked cast, Corda 5 have removed unchecked cast from their codebase. The third class are a number of ActiveMQ tests which appear to have a memory leak somewhere.
273 lines
9.1 KiB
Groovy
273 lines
9.1 KiB
Groovy
evaluationDependsOn(":node:capsule")
|
|
|
|
|
|
import com.github.dockerjava.api.model.Identifier
|
|
import net.corda.build.docker.DockerImage
|
|
import net.corda.build.docker.DockerUtils
|
|
import net.corda.build.docker.ObjectInputStreamWithCustomClassLoader
|
|
|
|
import java.nio.file.Files
|
|
import java.nio.file.StandardCopyOption
|
|
import java.time.LocalDateTime
|
|
import java.time.format.DateTimeFormatter
|
|
import java.util.stream.Collectors
|
|
import java.util.stream.Stream
|
|
|
|
apply plugin: 'org.jetbrains.kotlin.jvm'
|
|
apply plugin: 'application'
|
|
|
|
// We need to set mainClassName before applying the shadow plugin.
|
|
mainClassName = 'net.corda.core.ConfigExporterMain'
|
|
apply plugin: 'com.github.johnrengelman.shadow'
|
|
|
|
dependencies{
|
|
implementation project(':node')
|
|
implementation project(':node-api')
|
|
implementation project(':common-configuration-parsing')
|
|
implementation project(':common-validation')
|
|
|
|
implementation "com.typesafe:config:$typesafe_config_version"
|
|
}
|
|
|
|
shadowJar {
|
|
baseName = 'config-exporter'
|
|
classifier = null
|
|
version = null
|
|
zip64 true
|
|
exclude '**/Log4j2Plugins.dat'
|
|
|
|
manifest {
|
|
attributes('Add-Opens': 'java.management/com.sun.jmx.mbeanserver ' +
|
|
'java.base/java.time java.base/java.io ' +
|
|
'java.base/java.util java.base/java.net ' +
|
|
'java.base/java.nio java.base/java.lang.invoke ' +
|
|
'java.base/java.security.cert java.base/java.security ' +
|
|
'java.base/javax.net.ssl java.base/java.util.concurrent ' +
|
|
'java.sql/java.sql'
|
|
)
|
|
}
|
|
}
|
|
|
|
enum ImageVariant {
|
|
UBUNTU_ZULU("Dockerfile", "17", "zulu-openjdk"),
|
|
AL_CORRETTO("DockerfileAL", "17", "amazonlinux2"),
|
|
OFFICIAL(UBUNTU_ZULU)
|
|
|
|
String dockerFile
|
|
String javaVersion
|
|
String baseImageFullName
|
|
|
|
ImageVariant(ImageVariant other) {
|
|
this.dockerFile = other.dockerFile
|
|
this.javaVersion = other.javaVersion
|
|
this.baseImageFullName = other.baseImageFullName
|
|
}
|
|
|
|
ImageVariant(String dockerFile, String javaVersion, String baseImageFullName) {
|
|
this.dockerFile = dockerFile
|
|
this.javaVersion = javaVersion
|
|
this.baseImageFullName = baseImageFullName
|
|
}
|
|
|
|
static final String getRepository(Project project) {
|
|
return project.properties.getOrDefault("docker.image.repository", "corda/corda")
|
|
}
|
|
|
|
Set<Identifier> buildTags(Project project) {
|
|
return ["${project.version.toString().toLowerCase()}-${baseImageFullName}"].stream().map {
|
|
toAppend -> "${getRepository(project)}:${toAppend}".toString()
|
|
}.map(Identifier.&fromCompoundString).collect(Collectors.toSet())
|
|
}
|
|
|
|
static Set<ImageVariant> toBeBuilt = Arrays.stream(values()).collect(Collectors.toSet())
|
|
}
|
|
|
|
class BuildDockerFolderTask extends DefaultTask {
|
|
|
|
@Option(option = "image", description = "Docker image variants that will be built")
|
|
void setVariants(List<ImageVariant> variants) {
|
|
ImageVariant.toBeBuilt = new HashSet<>(variants)
|
|
}
|
|
|
|
@OptionValues("image")
|
|
Collection<ImageVariant> getAllVariants() {
|
|
return EnumSet.allOf(ImageVariant.class)
|
|
}
|
|
|
|
@Input
|
|
Iterable<ImageVariant> getVariantsToBuild() {
|
|
return ImageVariant.toBeBuilt
|
|
}
|
|
|
|
@InputFiles
|
|
FileCollection getDockerBuildFiles() {
|
|
return project.fileTree("${project.projectDir}/src/docker/build")
|
|
}
|
|
|
|
@InputFiles
|
|
FileCollection getShellScripts() {
|
|
return project.fileTree("${project.projectDir}/src/bash")
|
|
}
|
|
|
|
private File cordaJar = project.findProject(":node:capsule").tasks.buildCordaJAR.outputs.files.filter {
|
|
it.name.contains("corda")
|
|
}.singleFile
|
|
|
|
private File configExporter = project.tasks.shadowJar.outputs.files.singleFile
|
|
|
|
private FileCollection getRequiredArtifacts() {
|
|
FileCollection res = project.tasks.shadowJar.outputs.files
|
|
def capsuleProject = project.findProject(":node:capsule")
|
|
def capsuleTaksOutput = capsuleProject.tasks.buildCordaJAR.outputs.files
|
|
res += capsuleTaksOutput
|
|
return res
|
|
}
|
|
|
|
@OutputFiles
|
|
FileCollection getDockerFiles() {
|
|
return project.objects.fileCollection().from(ImageVariant.toBeBuilt.stream().map {
|
|
new File(dockerBuildDir, it.dockerFile)
|
|
}.collect(Collectors.toList()))
|
|
}
|
|
|
|
@OutputDirectory
|
|
final File dockerBuildDir = project.file("${project.buildDir}/docker/build")
|
|
|
|
@TaskAction
|
|
def run() {
|
|
for(ImageVariant imageVariant : ImageVariant.toBeBuilt) {
|
|
def sourceFile = project.projectDir.toPath().resolve("src/docker/${imageVariant.dockerFile}")
|
|
def destinationFile = dockerBuildDir.toPath().resolve(imageVariant.dockerFile)
|
|
Files.copy(sourceFile, destinationFile, StandardCopyOption.REPLACE_EXISTING)
|
|
}
|
|
Files.copy(cordaJar.toPath(), dockerBuildDir.toPath().resolve("corda.jar"), StandardCopyOption.REPLACE_EXISTING)
|
|
Files.copy(configExporter.toPath(), dockerBuildDir.toPath().resolve("config-exporter.jar"), StandardCopyOption.REPLACE_EXISTING)
|
|
|
|
["src/bash/run-corda.sh",
|
|
"src/config/starting-node.conf",
|
|
"src/bash/generate-config.sh"].forEach {
|
|
def source = project.file(it).toPath()
|
|
Files.copy(source, dockerBuildDir.toPath().resolve(source.fileName), StandardCopyOption.REPLACE_EXISTING)
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
class BuildDockerImageTask extends DefaultTask {
|
|
|
|
@Option(option = "image", description = "Docker image variants that will be built")
|
|
void setVariants(List<ImageVariant> variants) {
|
|
ImageVariant.toBeBuilt = new HashSet<>(variants)
|
|
}
|
|
|
|
@OptionValues("image")
|
|
Collection<ImageVariant> getAllVariants() {
|
|
return EnumSet.allOf(ImageVariant.class)
|
|
}
|
|
|
|
@OutputDirectory
|
|
final File dockerBuildDir = project.file("${project.buildDir}/docker/build")
|
|
|
|
@OutputDirectory
|
|
final File dockerBuiltImageDir = project.file("${project.buildDir}/docker/images")
|
|
|
|
@Input
|
|
String getRepository() {
|
|
return ImageVariant.getRepository(project)
|
|
}
|
|
|
|
@InputFiles
|
|
FileCollection dockerFiles
|
|
|
|
private Map<ImageVariant, DockerImage> images
|
|
|
|
@OutputFiles
|
|
FileCollection getImageFiles() {
|
|
return project.objects.fileCollection().from(ImageVariant.toBeBuilt.stream().map { imageVariant ->
|
|
dockerBuiltImageDir.toPath().resolve(imageVariant.toString()).toFile()
|
|
}.collect(Collectors.toList()))
|
|
}
|
|
|
|
void from(BuildDockerFolderTask buildDockerFolderTask) {
|
|
dockerFiles = buildDockerFolderTask.outputs.files
|
|
}
|
|
|
|
@Override
|
|
Task configure(Closure closure) {
|
|
return super.configure(closure)
|
|
}
|
|
|
|
@TaskAction
|
|
def run() {
|
|
this.@images = ImageVariant.toBeBuilt.stream().map { imageVariant ->
|
|
new Tuple2<>(imageVariant, new DockerImage(
|
|
baseDir: dockerBuildDir,
|
|
dockerFile: imageVariant.dockerFile,
|
|
tags: imageVariant.buildTags(project)))
|
|
}.collect(Collectors.toMap({it.first}, {it.second}))
|
|
DockerUtils.buildImages(project, this.@images.values())
|
|
images.entrySet().forEach { entry ->
|
|
ImageVariant imageVariant = entry.key
|
|
def destinationFile = dockerBuiltImageDir.toPath().resolve(imageVariant.toString())
|
|
new ObjectOutputStream(Files.newOutputStream(destinationFile)).withStream {
|
|
it.writeObject(entry.value)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
class PushDockerImage extends DefaultTask {
|
|
@Option(option = "image", description = "Docker image variants that will be built")
|
|
void setVariants(List<ImageVariant> variants) {
|
|
ImageVariant.toBeBuilt = new HashSet<>(variants)
|
|
}
|
|
|
|
@OptionValues("image")
|
|
Collection<ImageVariant> getAllVariants() {
|
|
return EnumSet.allOf(ImageVariant.class)
|
|
}
|
|
|
|
private static String registryURL
|
|
|
|
@Option(option = "registry-url", description = "Docker image registry where images will be pushed, defaults to DockerHub")
|
|
void setRegistryURL(String registryURL) {
|
|
PushDockerImage.registryURL = registryURL
|
|
}
|
|
|
|
@InputFiles
|
|
FileCollection imageFiles
|
|
|
|
def from(BuildDockerImageTask buildDockerImageTask) {
|
|
imageFiles = buildDockerImageTask.outputs.files
|
|
}
|
|
|
|
@TaskAction
|
|
def run() {
|
|
def classLoader = DockerImage.class.classLoader
|
|
Stream<DockerImage> imageStream = imageFiles.files.stream().filter{
|
|
it.isFile()
|
|
}.map {
|
|
new ObjectInputStreamWithCustomClassLoader(Files.newInputStream(it.toPath()), classLoader).withStream {
|
|
DockerImage image = it.readObject()
|
|
if(PushDockerImage.registryURL) {
|
|
image.destination = PushDockerImage.registryURL
|
|
}
|
|
image
|
|
}
|
|
}
|
|
DockerUtils.pushImages(project, imageStream)
|
|
}
|
|
}
|
|
|
|
def buildDockerFolderTask = tasks.register("buildDockerFolder", BuildDockerFolderTask) {
|
|
dependsOn = [ tasks.named('shadowJar') ]
|
|
}
|
|
|
|
def buildDockerImageTask = tasks.register("buildDockerImage", BuildDockerImageTask) {
|
|
from(buildDockerFolderTask.get())
|
|
}
|
|
|
|
tasks.register("pushDockerImage", PushDockerImage) {
|
|
from(buildDockerImageTask.get())
|
|
}
|