Check the property for compose.container.image in order to get the appropriate docker image in the ComposeContainer.

Author: fokion

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

@@ -13,6 +13,7 @@
 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;
@@ -61,7 +62,7 @@ public class ComposeContainer extends FailureDetectingExternalResource implement
 
     public static final String COMPOSE_EXECUTABLE = SystemUtils.IS_OS_WINDOWS ? "docker.exe" : "docker";
 
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker:24.0.2");
+    public static final String DEFAULT_DOCKER_IMAGE = "docker:24.0.2";
 
     private final ComposeDelegate composeDelegate;
 
@@ -88,7 +89,7 @@ public ComposeContainer(String identifier, List<File> composeFiles) {
                 composeFiles,
                 identifier,
                 COMPOSE_EXECUTABLE,
-                DEFAULT_IMAGE_NAME
+                DockerImageName.parse(TestcontainersConfiguration.getInstance().getEnvVarOrUserProperty("compose.container.image",DEFAULT_DOCKER_IMAGE))
             );
         this.project = this.composeDelegate.getProject();
     }

core/src/test/java/org/testcontainers/containers/ComposeContainerTest.java

@@ -0,0 +1,69 @@
+package org.testcontainers.containers;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
+import com.google.common.collect.Lists;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.utility.TestcontainersConfiguration;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.Assert.*;
+
+public class ComposeContainerTest {
+    private TestLogAppender testLogAppender;
+    private Logger rootLogger;
+
+    @Before
+    public void setup() {
+        testLogAppender = new TestLogAppender();
+        testLogAppender.start();
+        rootLogger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        rootLogger.addAppender(testLogAppender);
+    }
+
+    @After
+    public void tearDown() {
+        rootLogger.detachAppender(testLogAppender);
+    }
+
+    @Test
+    public void testWithCustomDockerImage() throws IOException {
+        TestcontainersConfiguration.getInstance().updateUserConfig("compose.container.image", "docker:25.0.2");
+        ComposeContainer composeContainer = new ComposeContainer(Lists.newArrayList(new File("src/test/resources/docker-compose-imagename-parsing-v2.yml")));
+        composeContainer.start();
+        System.clearProperty("compose.container.image");
+        List<String> logs = testLogAppender.getLogs();
+        composeContainer.stop();
+        assertNotNull(logs);
+        Optional<String> verification = logs.stream().filter(line -> line.contains("Creating container for image: docker:25.0.2")).findFirst();
+        assertTrue(verification.isPresent());
+        TestcontainersConfiguration.getInstance().updateUserConfig("compose.container.image", "");
+    }
+
+    private static class TestLogAppender extends AppenderBase<ILoggingEvent> {
+        private final List<String> logs = new ArrayList<>();
+
+        @Override
+        protected void append(ILoggingEvent eventObject) {
+            logs.add(eventObject.getFormattedMessage());
+        }
+
+        public List<String> getLogs() {
+            return logs;
+        }
+
+        public void clearLogs() {
+            logs.clear();
+        }
+    }
+}