Merge branch 'main' into main

Author: rajucomp

.github/pull_request_template.md

@@ -1,6 +1,8 @@
 <!--
-Thanks for contributing to Testcontainers. Please review the following notes before
-submitting a pull request.
+Thanks for contributing to Testcontainers. Before submitting a pull request, please
+review our contributing guidelines at https://java.testcontainers.org/contributing/
+
+Please also review the following notes before submitting a pull request.
 
 New Modules:
 

core/build.gradle

@@ -34,8 +34,8 @@ task jarFileTest(type: Test) {
     testClassesDirs = sourceSets.jarFileTest.output.classesDirs
     classpath = sourceSets.jarFileTest.runtimeClasspath
 
-    file(shadowJar.outputs.files.singleFile) // input for correct caching
-    systemProperty("jarFile", shadowJar.outputs.files.singleFile)
+    inputs.files(shadowJar).withPathSensitivity(PathSensitivity.RELATIVE)
+    systemProperty("jarFile", project.projectDir.toPath().relativize(shadowJar.outputs.files.singleFile.toPath()).toString())
 
     dependsOn(shadowJar)
 }
@@ -80,8 +80,8 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.3.0'
 
-    api platform('com.github.docker-java:docker-java-bom:3.7.0')
-    shaded platform('com.github.docker-java:docker-java-bom:3.7.0')
+    api platform('com.github.docker-java:docker-java-bom:3.7.1')
+    shaded platform('com.github.docker-java:docker-java-bom:3.7.1')
 
     api "com.github.docker-java:docker-java-api"
 

core/src/main/java/org/testcontainers/containers/DockerModelRunnerContainer.java

@@ -79,10 +79,20 @@ public DockerModelRunnerContainer withModel(String model) {
         return this;
     }
 
+    /**
+     * Returns the base endpoint URL for the Docker Model Runner service.
+     *
+     * @return the base URL in the format {@code http://<host>:<port>}
+     */
     public String getBaseEndpoint() {
         return "http://" + getHost() + ":" + getMappedPort(PORT);
     }
 
+    /**
+     * Returns the OpenAI-compatible API endpoint URL for the Docker Model Runner service.
+     *
+     * @return the OpenAI-compatible endpoint URL in the format {@code http://<host>:<port>/engines}
+     */
     public String getOpenAIEndpoint() {
         return getBaseEndpoint() + "/engines";
     }

core/src/main/java/org/testcontainers/containers/ParsedDockerComposeFile.java

@@ -50,7 +50,7 @@ class ParsedDockerComposeFile {
         SafeConstructor constructor = new SafeConstructor(options) {
             @Override
             protected Object constructObject(Node node) {
-                if (node.getTag().equals(new Tag("!reset"))) {
+                if (node.getTag().equals(new Tag("!reset")) || node.getTag().equals(new Tag("!override"))) {
                     return null;
                 }
                 return super.constructObject(node);

core/src/main/java/org/testcontainers/utility/RyukContainer.java

@@ -9,7 +9,7 @@
 class RyukContainer extends GenericContainer<RyukContainer> {
 
     RyukContainer() {
-        super("testcontainers/ryuk:0.13.0");
+        super("testcontainers/ryuk:0.14.0");
         withExposedPorts(8080);
         withCreateContainerCmdModifier(cmd -> {
             cmd.withName("testcontainers-ryuk-" + DockerClientFactory.SESSION_ID);

core/src/test/java/org/testcontainers/junit/ComposeContainerOverrideTest.java

@@ -45,4 +45,35 @@ void resetEnvironment() {
             assertThat(container.getConfig().getEnv()).doesNotContain("foo=bar");
         }
     }
+
+    @Test
+    void readLabel() {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), BASE)
+                .withExposedService("redis", 6379)
+        ) {
+            compose.start();
+            InspectContainerResponse container = compose
+                .getContainerByServiceName("redis-1")
+                .map(ContainerState::getContainerInfo)
+                .get();
+            assertThat(container.getConfig().getLabels()).containsKey("label1");
+        }
+    }
+
+    @Test
+    void readOverriddenLabel() {
+        try (
+            ComposeContainer compose = new ComposeContainer(DockerImageName.parse("docker:25.0.5"), BASE, OVERRIDE)
+                .withExposedService("redis", 6379)
+        ) {
+            compose.start();
+            InspectContainerResponse container = compose
+                .getContainerByServiceName("redis-1")
+                .map(ContainerState::getContainerInfo)
+                .get();
+            assertThat(container.getConfig().getLabels()).doesNotContainKey("label1");
+            assertThat(container.getConfig().getLabels()).containsKey("label2");
+        }
+    }
 }

core/src/test/java/org/testcontainers/junit/ComposeContainerVolumeRemovalTest.java

@@ -1,5 +1,6 @@
 package org.testcontainers.junit;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -16,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@Disabled
 class ComposeContainerVolumeRemovalTest {
 
     public static Stream<Arguments> params() {

…/ComposeContainerWithWaitStrategies.java …poseContainerWithWaitStrategiesTest.javacore/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java renamed to core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java renamed to core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java

@@ -10,7 +10,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class ComposeContainerWithWaitStrategies {
+class ComposeContainerWithWaitStrategiesTest {
 
     private static final int REDIS_PORT = 6379;
 

core/src/test/java/org/testcontainers/junit/DockerComposeContainerVolumeRemovalTest.java

@@ -1,5 +1,6 @@
 package org.testcontainers.junit;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.DockerClientFactory;
@@ -15,6 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@Disabled
 class DockerComposeContainerVolumeRemovalTest {
 
     public static Object[][] params() {

core/src/test/resources/compose-override/compose-override.yml

@@ -5,3 +5,5 @@ services:
       - 6379
     environment:
       foo: !reset null
+    labels: !override
+      label2: value2