Skip to content

Commit a28ded5

Browse files
committed
Change DockerComposeContainer to ComposeContainer
To use docker v2 instead of v1
1 parent fe36834 commit a28ded5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

geode-assembly/src/acceptanceTest/java/org/apache/geode/rules/DockerComposeRule.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.testcontainers.DockerClientFactory;
3333
import org.testcontainers.containers.Container;
3434
import org.testcontainers.containers.ContainerState;
35-
import org.testcontainers.containers.DockerComposeContainer;
35+
import org.testcontainers.containers.ComposeContainer;
3636
import org.testcontainers.containers.output.BaseConsumer;
3737
import org.testcontainers.containers.output.FrameConsumerResultCallback;
3838
import org.testcontainers.containers.output.OutputFrame;
@@ -77,7 +77,7 @@ public class DockerComposeRule extends ExternalResource {
7777
private final RuleChain delegate;
7878
private final String composeFile;
7979
private final Map<String, List<Integer>> exposedServices;
80-
private DockerComposeContainer<?> composeContainer;
80+
private ComposeContainer composeContainer;
8181

8282
public DockerComposeRule(String composeFile, Map<String, List<Integer>> exposedServices) {
8383
this.composeFile = composeFile;
@@ -94,7 +94,7 @@ public Statement apply(Statement base, Description description) {
9494
@Override
9595
public void evaluate() throws Throwable {
9696

97-
composeContainer = new DockerComposeContainer<>("compose", new File(composeFile));
97+
composeContainer = new ComposeContainer("compose", new File(composeFile));
9898
exposedServices.forEach((service, ports) -> ports
9999
.forEach(p -> composeContainer.withExposedService(service, p)));
100100
composeContainer.withLocalCompose(true);

0 commit comments

Comments
 (0)