Merge branch 'main' into main

Author: rajucomp

.github/workflows/moby-latest.yml

@@ -14,9 +14,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - { install-docker-type: "STABLE", channel: stable, rootless: false }
-          - { install-docker-type: "ROOTLESS", channel: stable, rootless: true }
-          - { install-docker-type: "ROOTFUL", channel: test, rootless: false }
+          - { install-docker-type: "STABLE", version: latest, channel: stable, rootless: false }
+          - { install-docker-type: "ROOTLESS", version: latest, channel: stable, rootless: true }
+          - { install-docker-type: "ROOTFUL", version: edge, channel: test, rootless: false }
     name: "Core tests using Docker ${{ matrix.install-docker-type }} (channel ${{ matrix.channel }})"
     runs-on: ubuntu-22.04
     continue-on-error: true
@@ -28,6 +28,7 @@ jobs:
         id: setup_docker
         uses: docker/setup-docker-action@v4
         with:
+          version: ${{ matrix.version }}
           channel: ${{ matrix.channel }}
           rootless: ${{ matrix.rootless }}
 

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.6.0')
-    shaded platform('com.github.docker-java:docker-java-bom:3.6.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 "com.github.docker-java:docker-java-api"
 

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

@@ -404,7 +404,7 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
         DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
 
         if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
-            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32);
+            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
         }
         Map<String, String> headers = new HashMap<>();
         headers.put("x-tc-sid", DockerClientFactory.SESSION_ID);

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

@@ -10,6 +10,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
@@ -97,7 +98,7 @@ private boolean isImagePresent(final String imageName) {
             .instance()
             .client()
             .listImagesCmd()
-            .withImageNameFilter(imageName)
+            .withFilter("reference", Collections.singletonList(imageName))
             .exec()
             .stream()
             .findFirst()

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

@@ -10,6 +10,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 import java.io.File;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
@@ -102,7 +103,7 @@ private boolean isImagePresent(final String imageName) {
             .instance()
             .client()
             .listImagesCmd()
-            .withImageNameFilter(imageName)
+            .withFilter("reference", Collections.singletonList(imageName))
             .exec()
             .stream()
             .findFirst()

examples/ollama-hugging-face/src/test/java/com/example/ollamahf/OllamaHuggingFaceContainer.java

@@ -28,14 +28,7 @@ protected void containerIsStarted(InspectContainerResponse containerInfo, boolea
             executeCommand("apt-get", "upgrade", "-y");
             executeCommand("apt-get", "install", "-y", "python3-pip");
             executeCommand("pip", "install", "huggingface-hub");
-            executeCommand(
-                "huggingface-cli",
-                "download",
-                huggingFaceModel.repository,
-                huggingFaceModel.model,
-                "--local-dir",
-                "."
-            );
+            executeCommand("hf", "download", huggingFaceModel.repository, huggingFaceModel.model, "--local-dir", ".");
             executeCommand("sh", "-c", String.format("echo '%s' > Modelfile", huggingFaceModel.modelfileContent));
             executeCommand("ollama", "create", huggingFaceModel.model, "-f", "Modelfile");
             executeCommand("rm", huggingFaceModel.model);
@@ -48,7 +41,7 @@ private void executeCommand(String... command) throws ContainerLaunchException,
         ExecResult execResult = execInContainer(command);
         if (execResult.getExitCode() > 0) {
             throw new ContainerLaunchException(
-                "Failed to execute " + String.join(" ", command) + ": " + execResult.getStderr()
+                "Failed to execute " + String.join(" ", command) + ": " + execResult.getStdout()
             );
         }
     }