Skip to content

Made docker/compose version overridable (#4296) #4377

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

Closed
skapral wants to merge 1 commit into from
+11 −5
Closed

Made docker/compose version overridable (#4296) #4377

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
16 changes: 11 additions & 5 deletions 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 @@ -71,7 +71,7 @@
*/
@Slf4j
public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> extends FailureDetectingExternalResource implements Startable {

private static final String DEFAULT_DOCKER_COMPOSE_VERSION = "1.29.2";
/**
* Random identifier which will become part of spawned containers names, so we can shut them down
*/
Expand All @@ -81,6 +81,7 @@ public class DockerComposeContainer<SELF extends DockerComposeContainer<SELF>> e
private final Map<String, Integer> scalingPreferences = new HashMap<>();
private DockerClient dockerClient;
private boolean localCompose;
private String dockerComposeVersion = DEFAULT_DOCKER_COMPOSE_VERSION;
private boolean pull = true;
private boolean build = false;
private Set<String> options = new HashSet<>();
Expand Down Expand Up @@ -195,6 +196,11 @@ private void pullImages() {
});
}

public SELF withDockerComposeVersion(String version) {
this.dockerComposeVersion = version;
return self();
}

public SELF withServices(@NonNull String... services) {
this.services = Arrays.asList(services);
return self();
Expand Down Expand Up @@ -300,7 +306,7 @@ private void runWithCompose(String cmd) {
if (localCompose) {
dockerCompose = new LocalDockerCompose(composeFiles, project);
} else {
dockerCompose = new ContainerisedDockerCompose(composeFiles, project);
dockerCompose = new ContainerisedDockerCompose(composeFiles, project, dockerComposeVersion);
}

dockerCompose
Expand Down Expand Up @@ -608,11 +614,11 @@ interface DockerCompose {
class ContainerisedDockerCompose extends GenericContainer<ContainerisedDockerCompose> implements DockerCompose {

public static final char UNIX_PATH_SEPERATOR = ':';
public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("docker/compose:1.29.2");
public static final String DEFAULT_IMAGE_NAME = "docker/compose";

public ContainerisedDockerCompose(List<File> composeFiles, String identifier) {
public ContainerisedDockerCompose(List<File> composeFiles, String identifier, String dockerComposeVersion) {

super(DEFAULT_IMAGE_NAME);
super(DockerImageName.parse(DEFAULT_IMAGE_NAME + ":" + dockerComposeVersion));
addEnv(ENV_PROJECT_NAME, identifier);

// Map the docker compose file into the container
Expand Down