Skip to content

making docker compose container configurable, fixes #422 #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bsideup merged 1 commit into from
Aug 1, 2017
Merged

making docker compose container configurable, fixes #422 #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions core/src/main/java/org/testcontainers/utility/TestcontainersConfiguration.java
View file
Open in desktop
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");
Copy link
Copy Markdown
Member

@bsideup bsideup Aug 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rnorth maybe we should upgrade the default to 1.15?

Copy link
Copy Markdown
Contributor Author

@grexe grexe Aug 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right @bsideup - just wanted to keep my changes humble and lean,-)

Copy link
Copy Markdown
Member

@bsideup bsideup Aug 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, we can do that separately :) Thanks for keeping it small :)

}

public String getTinyImage() {
return (String) properties.getOrDefault("tinyimage.container.image", "alpine:3.5");
}
Expand Down