Merge branch 'main' into docs/localstack-auth-token-warning

Author: PreAgile

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

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

modules/cockroachdb/src/test/java/org/testcontainers/CockroachDBTestImages.java

@@ -4,12 +4,4 @@
 
 public interface CockroachDBTestImages {
     DockerImageName COCKROACHDB_IMAGE = DockerImageName.parse("cockroachdb/cockroach:v22.2.3");
-
-    DockerImageName FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT = DockerImageName.parse(
-        "cockroachdb/cockroach:v22.1.0"
-    );
-
-    DockerImageName COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED = DockerImageName.parse(
-        "cockroachdb/cockroach:v21.2.17"
-    );
 }

modules/cockroachdb/src/test/java/org/testcontainers/cockroachdb/CockroachContainerTest.java

@@ -11,7 +11,6 @@
 import java.util.logging.LogManager;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 class CockroachContainerTest extends AbstractContainerDatabaseTest {
     static {
@@ -22,7 +21,7 @@ class CockroachContainerTest extends AbstractContainerDatabaseTest {
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            CockroachContainer cockroach = new CockroachContainer("cockroachdb/cockroach:v22.2.3")
+            CockroachContainer cockroach = new CockroachContainer("cockroachdb/cockroach:v26.1.1")
             // }
         ) {
             cockroach.start();
@@ -71,9 +70,7 @@ void testWithAdditionalUrlParamInJdbcUrl() {
     @Test
     void testWithUsernamePasswordDatabase() throws SQLException {
         try (
-            CockroachContainer cockroach = new CockroachContainer(
-                CockroachDBTestImages.FIRST_COCKROACHDB_IMAGE_WITH_ENV_VARS_SUPPORT
-            )
+            CockroachContainer cockroach = new CockroachContainer(CockroachDBTestImages.COCKROACHDB_IMAGE)
                 .withUsername("test_user")
                 .withPassword("test_password")
                 .withDatabaseName("test_database")
@@ -90,25 +87,6 @@ void testWithUsernamePasswordDatabase() throws SQLException {
         }
     }
 
-    @Test
-    void testAnExceptionIsThrownWhenImageDoesNotSupportEnvVars() {
-        CockroachContainer cockroachContainer = new CockroachContainer(
-            CockroachDBTestImages.COCKROACHDB_IMAGE_WITH_ENV_VARS_UNSUPPORTED
-        );
-
-        assertThatThrownBy(() -> cockroachContainer.withUsername("test_user"))
-            .isInstanceOf(UnsupportedOperationException.class)
-            .withFailMessage("Setting a username in not supported in the versions below 22.1.0");
-
-        assertThatThrownBy(() -> cockroachContainer.withPassword("test_password"))
-            .isInstanceOf(UnsupportedOperationException.class)
-            .withFailMessage("Setting a password in not supported in the versions below 22.1.0");
-
-        assertThatThrownBy(() -> cockroachContainer.withDatabaseName("test_database"))
-            .isInstanceOf(UnsupportedOperationException.class)
-            .withFailMessage("Setting a databaseName in not supported in the versions below 22.1.0");
-    }
-
     @Test
     void testInitializationScript() throws SQLException {
         String sql =