Add oci image definition, use it in integration tests

Author: SgtSilvio

build.gradle.kts

@@ -36,6 +36,32 @@ oci {
             optionalCredentials()
         }
     }
+    imageMapping {
+        mapModule("com.hivemq", "hivemq-community-edition") {
+            toImage("hivemq/hivemq-ce")
+        }
+    }
+    imageDefinitions.register("main") {
+        allPlatforms {
+            dependencies {
+                runtime("com.hivemq:hivemq-community-edition:latest") { isChanging = true }
+            }
+            config {
+                ports = setOf("9090")
+            }
+            layers {
+                layer("hivemqExtension") {
+                    contents {
+                        permissions("opt/hivemq/", 0b111_111_000)
+                        permissions("opt/hivemq/extensions/", 0b111_111_000)
+                        into("opt/hivemq/extensions") {
+                            from(zipTree(tasks.hivemqExtensionZip.flatMap { it.archiveFile }))
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 @Suppress("UnstableApiUsage")
@@ -62,7 +88,7 @@ testing {
             }
             oci.of(this) {
                 imageDependencies {
-                    runtime("hivemq:hivemq-ce:latest") { isChanging = true }
+                    runtime(project).tag("latest")
                 }
             }
         }

src/integrationTest/java/com/hivemq/extensions/heartbeat/CustomConfigIT.java

@@ -41,14 +41,13 @@
 class CustomConfigIT {
 
     @Container
-    final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq-ce")) //
-            .withExtension(MountableFile.forClasspathResource("hivemq-heartbeat-extension"))
-            .waitForExtension("HiveMQ Heartbeat Extension")
-            .withExposedPorts(9191)
-            .withFileInExtensionHomeFolder(MountableFile.forClasspathResource("extension-config.xml"),
-                    "hivemq-heartbeat-extension",
-                    "/extension-config.xml")
-            .withLogConsumer(outputFrame -> System.out.print("HiveMQ: " + outputFrame.getUtf8String()));
+    final @NotNull HiveMQContainer hivemq =
+            new HiveMQContainer(OciImages.getImageName("hivemq/extensions/hivemq-heartbeat-extension")
+                    .asCompatibleSubstituteFor("hivemq/hivemq-ce")) //
+                    .withExposedPorts(9191)
+                    .withCopyToContainer(MountableFile.forClasspathResource("extension-config.xml"),
+                            "/opt/hivemq/extensions/hivemq-heartbeat-extension/extension-config.xml")
+                    .withLogConsumer(outputFrame -> System.out.print("HiveMQ: " + outputFrame.getUtf8String()));
 
     @Test
     @Timeout(value = 2, unit = TimeUnit.MINUTES)

src/integrationTest/java/com/hivemq/extensions/heartbeat/DefaultConfigIT.java

@@ -26,7 +26,6 @@
 import org.testcontainers.hivemq.HiveMQContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.MountableFile;
 
 import java.util.concurrent.TimeUnit;
 
@@ -41,11 +40,11 @@
 class DefaultConfigIT {
 
     @Container
-    final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq-ce")) //
-            .withExtension(MountableFile.forClasspathResource("hivemq-heartbeat-extension"))
-            .waitForExtension("HiveMQ Heartbeat Extension")
-            .withExposedPorts(9090)
-            .withLogConsumer(outputFrame -> System.out.print("HiveMQ: " + outputFrame.getUtf8String()));
+    final @NotNull HiveMQContainer hivemq =
+            new HiveMQContainer(OciImages.getImageName("hivemq/extensions/hivemq-heartbeat-extension")
+                    .asCompatibleSubstituteFor("hivemq/hivemq-ce")) //
+                    .withExposedPorts(9090)
+                    .withLogConsumer(outputFrame -> System.out.print("HiveMQ: " + outputFrame.getUtf8String()));
 
     @Test
     @Timeout(value = 2, unit = TimeUnit.MINUTES)

src/integrationTest/java/com/hivemq/extensions/heartbeat/FallbackToDefaultsIT.java

@@ -41,14 +41,13 @@
 class FallbackToDefaultsIT {
 
     @Container
-    final @NotNull HiveMQContainer hivemq = new HiveMQContainer(OciImages.getImageName("hivemq/hivemq-ce")) //
-            .withExtension(MountableFile.forClasspathResource("hivemq-heartbeat-extension"))
-            .waitForExtension("HiveMQ Heartbeat Extension")
-            .withExposedPorts(9090)
-            .withFileInExtensionHomeFolder(MountableFile.forClasspathResource("broken-config.xml"),
-                    "hivemq-heartbeat-extension",
-                    "/extension-config.xml")
-            .withLogConsumer(outputFrame -> System.out.print("HiveMQ: " + outputFrame.getUtf8String()));
+    final @NotNull HiveMQContainer hivemq =
+            new HiveMQContainer(OciImages.getImageName("hivemq/extensions/hivemq-heartbeat-extension")
+                    .asCompatibleSubstituteFor("hivemq/hivemq-ce")) //
+                    .withExposedPorts(9090)
+                    .withCopyToContainer(MountableFile.forClasspathResource("broken-config.xml"),
+                            "/opt/hivemq/extensions/hivemq-heartbeat-extension/extension-config.xml")
+                    .withLogConsumer(outputFrame -> System.out.print("HiveMQ: " + outputFrame.getUtf8String()));
 
     @Test
     @Timeout(value = 2, unit = TimeUnit.MINUTES)