Skip to content

Commit

Permalink
making docker compose container configurable, fixes #422 (#425)
Browse files Browse the repository at this point in the history
  • Loading branch information
grexe authored and bsideup committed Aug 1, 2017
1 parent 6c8fb1b commit 32b6551
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down

0 comments on commit 32b6551

Please sign in to comment.