Update ComposeContainer and DockerComposeContainer to the latest version of docker and update the constructors

Author: fokion

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

@@ -60,42 +60,80 @@ public class ComposeContainer implements Startable {
 
     public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
 
-    public static final String DEFAULT_DOCKER_IMAGE = "docker:24.0.2";
+    public static final String DEFAULT_DOCKER_IMAGE = "docker:27.5.0";
 
     private final ComposeDelegate composeDelegate;
 
     private String project;
 
     private List<String> filesInDirectory = new ArrayList<>();
 
-    public ComposeContainer(File... composeFiles) {
-        this(Arrays.asList(composeFiles));
+    public ComposeContainer(DockerImageName image, File... composeFiles) {
+        this(image, Arrays.asList(composeFiles));
     }
 
-    public ComposeContainer(List<File> composeFiles) {
-        this(Base58.randomString(6).toLowerCase(), composeFiles);
+    public ComposeContainer(DockerImageName image, List<File> composeFiles) {
+        this(image,Base58.randomString(6).toLowerCase(),composeFiles);
     }
 
-    public ComposeContainer(String identifier, File... composeFiles) {
-        this(identifier, Arrays.asList(composeFiles));
+    public ComposeContainer(DockerImageName image, String identifier, File... composeFiles) {
+        this(image,identifier, Arrays.asList(composeFiles));
     }
 
-    public ComposeContainer(String identifier, List<File> composeFiles) {
+    public ComposeContainer(DockerImageName image, String identifier, List<File> composeFiles) {
         this.composeDelegate =
             new ComposeDelegate(
                 ComposeDelegate.ComposeVersion.V2,
                 composeFiles,
                 identifier,
                 COMPOSE_EXECUTABLE,
-                DockerImageName.parse(
-                    TestcontainersConfiguration
-                        .getInstance()
-                        .getEnvVarOrUserProperty("compose.container.image", DEFAULT_DOCKER_IMAGE)
-                )
+                image
             );
         this.project = this.composeDelegate.getProject();
     }
 
+    /**
+     * @deprecated
+     *  Use the new constructor ComposeContainer(DockerImageName image, File... composeFiles)
+     */
+    @Deprecated
+    public ComposeContainer(File... composeFiles) {
+        this(getDockerImageName(),Arrays.asList(composeFiles));
+    }
+    /**
+     * @deprecated
+     *  Use the new constructor ComposeContainer(DockerImageName image,List<File> composeFiles)
+     */
+    @Deprecated
+    public ComposeContainer(List<File> composeFiles) {
+        this(getDockerImageName(), composeFiles);
+    }
+    /**
+     * @deprecated
+     *  Use the new constructor ComposeContainer(DockerImageName image, String identifier, File... composeFile)
+     */
+    @Deprecated
+    public ComposeContainer(String identifier, File... composeFiles) {
+        this(getDockerImageName(),identifier, Arrays.asList(composeFiles));
+    }
+
+    /**
+     * @deprecated
+     * Use the new constructor ComposeContainer(DockerImageName image,String identifier, List<File> composeFiles)
+     */
+    @Deprecated
+    public ComposeContainer(String identifier, List<File> composeFiles) {
+       this(getDockerImageName(),identifier, composeFiles);
+    }
+
+    public static DockerImageName getDockerImageName() {
+        return DockerImageName.parse(
+            TestcontainersConfiguration
+                .getInstance()
+                .getEnvVarOrUserProperty("compose.container.image", DEFAULT_DOCKER_IMAGE)
+        );
+    }
+
     @Override
     public void start() {
         synchronized (MUTEX) {

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

@@ -11,11 +11,13 @@
 import org.testcontainers.lifecycle.Startable;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.TestcontainersConfiguration;
 
 import java.io.File;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -24,6 +26,8 @@
 import java.util.Set;
 import java.util.function.Consumer;
 
+import static org.testcontainers.containers.ComposeContainer.getDockerImageName;
+
 /**
  * Container which launches Docker Compose, for the purposes of launching a defined set of containers.
  */
@@ -58,43 +62,73 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> i
 
     public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker-compose.exe" : "docker-compose";
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.29.2");
-
     private final ComposeDelegate composeDelegate;
 
     private String project;
 
     private List<String> filesInDirectory = new ArrayList<>();
 
+
+
+    public DockerComposeContainer(DockerImageName image, String identifier, File composeFile) {
+        this(image, identifier, Collections.singletonList(composeFile));
+    }
+
+    public DockerComposeContainer(DockerImageName image, List<File> composeFiles) {
+        this(image,Base58.randomString(6).toLowerCase(),composeFiles);
+    }
+
+    public DockerComposeContainer(DockerImageName image, String identifier, File... composeFiles) {
+        this(image,identifier, Arrays.asList(composeFiles));
+    }
+    public DockerComposeContainer(DockerImageName image, String identifier, List<File> composeFiles) {
+        this.composeDelegate =
+            new ComposeDelegate(
+                ComposeDelegate.ComposeVersion.V2,
+                composeFiles,
+                identifier,
+                COMPOSE_EXECUTABLE,
+                image
+            );
+        this.project = this.composeDelegate.getProject();
+    }
+
+
     @Deprecated
     public DockerComposeContainer(File composeFile, String identifier) {
         this(identifier, composeFile);
     }
 
+    @Deprecated
     public DockerComposeContainer(File... composeFiles) {
         this(Arrays.asList(composeFiles));
     }
 
+    @Deprecated
     public DockerComposeContainer(List<File> composeFiles) {
         this(Base58.randomString(6).toLowerCase(), composeFiles);
     }
 
+    @Deprecated
     public DockerComposeContainer(String identifier, File... composeFiles) {
         this(identifier, Arrays.asList(composeFiles));
     }
 
+    @Deprecated
     public DockerComposeContainer(String identifier, List<File> composeFiles) {
         this.composeDelegate =
             new ComposeDelegate(
                 ComposeDelegate.ComposeVersion.V1,
                 composeFiles,
                 identifier,
                 COMPOSE_EXECUTABLE,
-                DEFAULT_IMAGE_NAME
+                getDockerImageName()
             );
         this.project = this.composeDelegate.getProject();
     }
 
+
+
     @Override
     public void start() {
         synchronized (MUTEX) {