diff --git a/build/container/ryuk.Dockerfile b/build/container/ryuk.Dockerfile new file mode 100644 index 00000000000..778ff3562f8 --- /dev/null +++ b/build/container/ryuk.Dockerfile @@ -0,0 +1,3 @@ +# CockroachDB +# See https://hub.docker.com/r/testcontainers/ryuk/tags +FROM testcontainers/ryuk:0.5.1 \ No newline at end of file diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml index b37c0df587b..e559714d7cc 100644 --- a/build/parents/build/pom.xml +++ b/build/parents/build/pom.xml @@ -1192,9 +1192,6 @@ org.apache.maven.plugins maven-failsafe-plugin - - true - ${project.version} ${test.performance.enable} diff --git a/pom.xml b/pom.xml index 138f3a5e240..e1d25555b71 100644 --- a/pom.xml +++ b/pom.xml @@ -953,13 +953,19 @@ def images = [] def isTrueString = { string -> string && Boolean.parseBoolean( string ) } def isNotBlankString = { string -> string?.trim() } + def parseImage = { file -> + { + def dockerFileContent = new File(file).text + if ((match = dockerFileContent =~ /FROM (.+)/)) { + return match.group(1).trim() + } + return '' + } + } + images += parseImage( './build/container/ryuk.Dockerfile' ) if ( isNotBlankString( '${test.database.run.kind}' ) && '${test.database.run.kind}' != 'h2') { - def dockerFileContent = new File('./build/container/${test.database.run.kind}.Dockerfile').text - if ((match = dockerFileContent =~ /FROM (.+)/)) { - def image = match.group(1).trim() - images += image - } + images += parseImage( './build/container/${test.database.run.kind}.Dockerfile' ) } if ( isTrueString( '${test.searchengine.run.image.pull}' ) && isNotBlankString( '${test.searchengine.run.image.name}' ) ) { images += '${test.searchengine.run.image.name}:${test.searchengine.run.image.tag}'