Merge branch 'main' into localstack-javadoc-adjustments

Author: eddumelendez

core/build.gradle

@@ -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/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() {

docs/modules/docker_compose.md

@@ -72,7 +72,7 @@ accessible via the static factory methods from of the `Wait` class.
 
 For instance, we can wait for exposed port and set a custom timeout:
 <!--codeinclude-->
-[Wait for the exposed port and use a custom timeout](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java) inside_block:composeContainerWaitForPortWithTimeout
+[Wait for the exposed port and use a custom timeout](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java) inside_block:composeContainerWaitForPortWithTimeout
 <!--/codeinclude-->
 
 Needless to say, we can define different strategies for each service in our Docker Compose setup. 
@@ -81,7 +81,7 @@ For example, our Redis container can wait for a successful redis-cli command,
 while our db service waits for a specific log message:
 
 <!--codeinclude-->
-[Wait for a custom command and a log message](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java) inside_block:composeContainerWithCombinedWaitStrategies
+[Wait for a custom command and a log message](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java) inside_block:composeContainerWithCombinedWaitStrategies
 <!--/codeinclude-->
 
 

docs/modules/localstack.md

@@ -10,15 +10,21 @@ You can start a LocalStack container instance from any Java application by using
 [Container creation](../../modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java) inside_block:container
 <!--/codeinclude-->
 
+Environment variables listed in the [LocalStack configuration documentation](https://docs.localstack.cloud/references/configuration/) may be used to customize LocalStack's configuration.
+Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
+
+!!! note
+    Starting March 23, 2026, `localstack/localstack` requires authentication via a `LOCALSTACK_AUTH_TOKEN` environment variable. Without it, the container will fail to start.
+
+    Use `.withEnv("LOCALSTACK_AUTH_TOKEN", System.getenv("LOCALSTACK_AUTH_TOKEN"))` to pass the token.
+    See the [LocalStack blog post](https://blog.localstack.cloud/localstack-single-image-next-steps/) for more details.
+
 ## Creating a client using AWS SDK
 
 <!--codeinclude-->
 [AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java) inside_block:with_aws_sdk_v2
 <!--/codeinclude-->
 
-Environment variables listed in [Localstack's README](https://github.com/localstack/localstack#configurations) may be used to customize Localstack's configuration. 
-Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
-
 ## Adding this module to your project dependencies
 
 Add the following dependency to your `pom.xml`/`build.gradle` file:

gradle.properties

@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=2.0.2
+testcontainers.version=2.0.4

gradle/publishing.gradle

@@ -96,7 +96,7 @@ publishing {
     }
     repositories {
         maven {
-            url = layout.buildDirectory.dir('staging-deploy')
+            url = rootProject.layout.buildDirectory.dir('staging-deploy')
         }
     }
 }
@@ -112,7 +112,7 @@ jreleaser {
                 central {
                     active = 'ALWAYS'
                     url = 'https://central.sonatype.com/api/v1/publisher'
-                    stagingRepository(layout.buildDirectory.dir("staging-deploy").get().toString())
+                    stagingRepository(rootProject.layout.buildDirectory.dir("staging-deploy").get().toString())
                     stage = 'UPLOAD'
                     applyMavenCentralRules = true
                     namespace = 'org.testcontainers'

mkdocs.yml

@@ -140,4 +140,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 2.0.2
+    latest_version: 2.0.4