Skip to content

Commit c504ece

Browse files
authored
Merge branch 'main' into fix-jarfiletest-cache-relocatability
2 parents 2235aeb + 561c483 commit c504ece

4 files changed

Lines changed: 22 additions & 6 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,20 @@ public DockerModelRunnerContainer withModel(String model) {
7979
return this;
8080
}
8181

82+
/**
83+
* Returns the base endpoint URL for the Docker Model Runner service.
84+
*
85+
* @return the base URL in the format {@code http://<host>:<port>}
86+
*/
8287
public String getBaseEndpoint() {
8388
return "http://" + getHost() + ":" + getMappedPort(PORT);
8489
}
8590

91+
/**
92+
* Returns the OpenAI-compatible API endpoint URL for the Docker Model Runner service.
93+
*
94+
* @return the OpenAI-compatible endpoint URL in the format {@code http://<host>:<port>/engines}
95+
*/
8696
public String getOpenAIEndpoint() {
8797
return getBaseEndpoint() + "/engines";
8898
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import static org.assertj.core.api.Assertions.assertThat;
1212

13-
class ComposeContainerWithWaitStrategies {
13+
class ComposeContainerWithWaitStrategiesTest {
1414

1515
private static final int REDIS_PORT = 6379;
1616

docs/modules/docker_compose.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ accessible via the static factory methods from of the `Wait` class.
7272

7373
For instance, we can wait for exposed port and set a custom timeout:
7474
<!--codeinclude-->
75-
[Wait for the exposed port and use a custom timeout](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java) inside_block:composeContainerWaitForPortWithTimeout
75+
[Wait for the exposed port and use a custom timeout](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java) inside_block:composeContainerWaitForPortWithTimeout
7676
<!--/codeinclude-->
7777

7878
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,
8181
while our db service waits for a specific log message:
8282

8383
<!--codeinclude-->
84-
[Wait for a custom command and a log message](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategies.java) inside_block:composeContainerWithCombinedWaitStrategies
84+
[Wait for a custom command and a log message](../../core/src/test/java/org/testcontainers/junit/ComposeContainerWithWaitStrategiesTest.java) inside_block:composeContainerWithCombinedWaitStrategies
8585
<!--/codeinclude-->
8686

8787

docs/modules/localstack.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,21 @@ You can start a LocalStack container instance from any Java application by using
1010
[Container creation](../../modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java) inside_block:container
1111
<!--/codeinclude-->
1212

13+
Environment variables listed in the [LocalStack configuration documentation](https://docs.localstack.cloud/references/configuration/) may be used to customize LocalStack's configuration.
14+
Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
15+
16+
!!! note
17+
Starting March 23, 2026, `localstack/localstack` requires authentication via a `LOCALSTACK_AUTH_TOKEN` environment variable. Without it, the container will fail to start.
18+
19+
Use `.withEnv("LOCALSTACK_AUTH_TOKEN", System.getenv("LOCALSTACK_AUTH_TOKEN"))` to pass the token.
20+
See the [LocalStack blog post](https://blog.localstack.cloud/localstack-single-image-next-steps/) for more details.
21+
1322
## Creating a client using AWS SDK
1423

1524
<!--codeinclude-->
1625
[AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/localstack/LocalStackContainerTest.java) inside_block:with_aws_sdk_v2
1726
<!--/codeinclude-->
1827

19-
Environment variables listed in [Localstack's README](https://github.com/localstack/localstack#configurations) may be used to customize Localstack's configuration.
20-
Use the `.withEnv(key, value)` method on `LocalStackContainer` to apply configuration settings.
21-
2228
## Adding this module to your project dependencies
2329

2430
Add the following dependency to your `pom.xml`/`build.gradle` file:

0 commit comments

Comments
 (0)