Skip to content

Commit b2cdfb3

Browse files
committed
Switch to ComposeContainer constructor to use V2 docker-compose
1 parent a78de16 commit b2cdfb3

File tree

4 files changed

+12
-12
lines changed
  • kogito-quarkus-examples
  • kogito-springboot-examples

4 files changed

+12
-12
lines changed

kogito-quarkus-examples/dmn-drools-quarkus-metrics/src/test/java/org/kie/kogito/examples/quarkus/GrafanaDockerComposeIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.kie.kogito.testcontainers.Constants;
2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;
29-
import org.testcontainers.containers.DockerComposeContainer;
29+
import org.testcontainers.containers.ComposeContainer;
3030
import org.testcontainers.containers.output.Slf4jLogConsumer;
3131
import org.testcontainers.containers.wait.strategy.Wait;
3232
import org.testcontainers.junit.jupiter.Container;
@@ -54,11 +54,11 @@ public class GrafanaDockerComposeIT {
5454
private static final String PROJECT_ARTIFACT_ID = ProjectMetadataProvider.getProjectArtifactId();
5555

5656
@Container
57-
public static DockerComposeContainer environment;
57+
public static ComposeContainer environment;
5858

5959
static {
6060
try {
61-
environment = new DockerComposeContainer(new File(GrafanaDockerComposeIT.class.getClassLoader().getResource("./docker-compose.yml").toURI()))
61+
environment = new ComposeContainer(new File(GrafanaDockerComposeIT.class.getClassLoader().getResource("./docker-compose.yml").toURI()))
6262
.withExposedService("grafana_1", GRAFANA_PORT, Wait.forListeningPort().withStartupTimeout(STARTUP_MINUTES_TIMEOUT))
6363
.withLogConsumer("grafana_1", new Slf4jLogConsumer(LOGGER))
6464
.withExposedService("hello_1", KOGITO_APPLICATION_PORT, Wait.forListeningPort().withStartupTimeout(STARTUP_MINUTES_TIMEOUT))

kogito-quarkus-examples/process-outbox-mongodb-quarkus/src/test/java/org/kie/kogito/quarkus/outbox/OutboxIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.kie.kogito.test.quarkus.kafka.KafkaTestClient;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
32-
import org.testcontainers.containers.DockerComposeContainer;
32+
import org.testcontainers.containers.ComposeContainer;
3333
import org.testcontainers.containers.output.OutputFrame;
3434
import org.testcontainers.containers.output.Slf4jLogConsumer;
3535

@@ -56,7 +56,7 @@ public class OutboxIT {
5656
private static final int DEBEZIUM_PORT = 8083;
5757

5858
//@Container
59-
private static DockerComposeContainer COMPOSE;
59+
private static ComposeContainer COMPOSE;
6060

6161
private int kogitoPort;
6262
private int debeziumPort;
@@ -69,7 +69,7 @@ public class OutboxIT {
6969
// if (!path.toFile().exists()) {
7070
// path = Paths.get("docker-compose.yml");
7171
// }
72-
// COMPOSE = new DockerComposeContainer(path.toFile());
72+
// COMPOSE = new ComposeContainer(path.toFile());
7373
// COMPOSE.withPull(false);
7474
// COMPOSE.withServices("kafka", "mongodb", "connect", "sidecar", "kogito");
7575
// COMPOSE.withExposedService("kogito", KOGITO_PORT);

kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/GrafanaDockerComposeIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.kie.kogito.testcontainers.Constants;
2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;
29-
import org.testcontainers.containers.DockerComposeContainer;
29+
import org.testcontainers.containers.ComposeContainer;
3030
import org.testcontainers.containers.output.Slf4jLogConsumer;
3131
import org.testcontainers.containers.wait.strategy.Wait;
3232
import org.testcontainers.junit.jupiter.Container;
@@ -54,11 +54,11 @@ public class GrafanaDockerComposeIT {
5454
private static final String PROJECT_ARTIFACT_ID = ProjectMetadataProvider.getProjectArtifactId();
5555

5656
@Container
57-
public static DockerComposeContainer environment;
57+
public static ComposeContainer environment;
5858

5959
static {
6060
try {
61-
environment = new DockerComposeContainer(new File(GrafanaDockerComposeIT.class.getClassLoader().getResource("./docker-compose.yml").toURI()))
61+
environment = new ComposeContainer(new File(GrafanaDockerComposeIT.class.getClassLoader().getResource("./docker-compose.yml").toURI()))
6262
.withExposedService("grafana_1", GRAFANA_PORT, Wait.forListeningPort().withStartupTimeout(STARTUP_MINUTES_TIMEOUT))
6363
.withLogConsumer("grafana_1", new Slf4jLogConsumer(LOGGER))
6464
.withExposedService("hello_1", KOGITO_APPLICATION_PORT, Wait.forListeningPort().withStartupTimeout(STARTUP_MINUTES_TIMEOUT))

kogito-springboot-examples/process-outbox-mongodb-springboot/src/test/java/org/kie/kogito/springboot/outbox/OutboxIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.kie.kogito.test.springboot.kafka.KafkaTestClient;
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
32-
import org.testcontainers.containers.DockerComposeContainer;
32+
import org.testcontainers.containers.ComposeContainer;
3333
import org.testcontainers.containers.output.OutputFrame;
3434
import org.testcontainers.containers.output.Slf4jLogConsumer;
3535

@@ -56,7 +56,7 @@ public class OutboxIT {
5656
private static final int DEBEZIUM_PORT = 8083;
5757

5858
//@Container
59-
private static DockerComposeContainer<?> COMPOSE;
59+
private static ComposeContainer<?> COMPOSE;
6060

6161
private int kogitoPort;
6262
private int debeziumPort;
@@ -69,7 +69,7 @@ public class OutboxIT {
6969
// if (!path.toFile().exists()) {
7070
// path = Paths.get("docker-compose.yml");
7171
// }
72-
// COMPOSE = new DockerComposeContainer<>(path.toFile());
72+
// COMPOSE = new ComposeContainer<>(path.toFile());
7373
// COMPOSE.withPull(false);
7474
// COMPOSE.withServices("kafka", "mongodb", "connect", "sidecar", "kogito");
7575
// COMPOSE.withExposedService("kogito", KOGITO_PORT);

0 commit comments

Comments
 (0)