HSEARCH-4674 Add ryuk back

hibernate · Oct 24, 2023 · 75cd843 · 75cd843
1 parent b5e3d6e
commit 75cd843
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/build/container/ryuk.Dockerfile 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
diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
@@ -1192,9 +1192,6 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <configuration>
-                        <environmentVariables>
-                            <TESTCONTAINERS_RYUK_DISABLED>true</TESTCONTAINERS_RYUK_DISABLED>
-                        </environmentVariables>
                         <systemPropertyVariables>
                             <org.hibernate.search.version>${project.version}</org.hibernate.search.version>
                             <org.hibernate.search.enable_performance_tests>${test.performance.enable}</org.hibernate.search.enable_performance_tests>

diff --git 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}'