Merge branch 'main' into feat/mysql-r2dbc-helper

Author: papa-piton-2256

core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java

@@ -401,21 +401,34 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
                 throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
         }
 
-        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
+        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig
+            .createDefaultConfigBuilder()
+            .withDockerHost(transportConfig.getDockerHost().toString());
 
-        if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
-            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
-        }
         Map<String, String> headers = new HashMap<>();
         headers.put("x-tc-sid", DockerClientFactory.SESSION_ID);
         headers.put("User-Agent", String.format("tc-java/%s", DockerClientFactory.TESTCONTAINERS_VERSION));
 
-        return DockerClientImpl.getInstance(
-            new AuthDelegatingDockerClientConfig(
-                configBuilder.withDockerHost(transportConfig.getDockerHost().toString()).build()
-            ),
-            new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
-        );
+        try {
+            if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
+                configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
+            }
+            DockerClient client = DockerClientImpl.getInstance(
+                new AuthDelegatingDockerClientConfig(configBuilder.build()),
+                new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
+            );
+            log.debug("Pinging Docker API version 1.44.");
+            client.pingCmd().exec();
+            return client;
+        } catch (Exception ex) {
+            log.debug("Fallback to Docker API version 1.32.");
+            return DockerClientImpl.getInstance(
+                new AuthDelegatingDockerClientConfig(
+                    configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32).build()
+                ),
+                new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
+            );
+        }
     }
 
     public synchronized String getDockerHostIpAddress() {

modules/questdb/src/test/java/org/testcontainers/QuestDBTestImages.java

@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface QuestDBTestImages {
-    DockerImageName QUESTDB_IMAGE = DockerImageName.parse("questdb/questdb:6.5.3");
+    DockerImageName QUESTDB_IMAGE = DockerImageName.parse("questdb/questdb:9.2.2");
 }

modules/questdb/src/test/java/org/testcontainers/junit/questdb/SimpleQuestDBTest.java

@@ -27,7 +27,7 @@ class SimpleQuestDBTest extends AbstractContainerDatabaseTest {
     @Test
     void testSimple() throws SQLException {
         try ( // container {
-            QuestDBContainer questDB = new QuestDBContainer("questdb/questdb:6.5.3")
+            QuestDBContainer questDB = new QuestDBContainer("questdb/questdb:9.2.2")
             // }
         ) {
             questDB.start();