making docker compose container configurable, fixes testcontainers#422

grexe · Aug 1, 2017 · 65b7d63 · 65b7d63
1 parent 6c8fb1b
commit 65b7d63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java b/core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
@@ -396,7 +396,7 @@ default void validateFileList(List<File> composeFiles) {
 class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {
     public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
 
-        super("docker/compose:1.8.0");
+        super(TestcontainersConfiguration.getInstance().getDockerComposeContainerImage());
         validateFileList(composeFiles);
 
         addEnv(ENV_PROJECT_NAME, identifier);

diff --git a/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java b/core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
@@ -34,6 +34,10 @@ public String getVncRecordedContainerImage() {
         return (String) properties.getOrDefault("vncrecorder.container.image", "richnorth/vnc-recorder:latest");
     }
 
+    public String getDockerComposeContainerImage() {
+        return (String) properties.getOrDefault("compose.container.image", "docker/compose:1.8.0");
+    }
+
     public String getTinyImage() {
         return (String) properties.getOrDefault("tinyimage.container.image", "alpine:3.5");
     }