Skip to content

Commit 79260f4

Browse files
committed
fix: replace DockerComposeContainer with ComposeContainer
1 parent 242c6f6 commit 79260f4

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

plugins/backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/BackendApplicationDefaultGenerator/src/test/java/config/DockerComposeInitializer-jpa.java.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import org.springframework.boot.test.util.TestPropertyValues;
1919
import org.springframework.context.ApplicationContextInitializer;
2020
import org.springframework.context.ConfigurableApplicationContext;
2121
import org.testcontainers.DockerClientFactory;
22-
import org.testcontainers.containers.DockerComposeContainer;
22+
import org.testcontainers.containers.ComposeContainer;
2323
import org.testcontainers.containers.wait.strategy.Wait;
2424

2525
public class DockerComposeInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
@@ -45,7 +45,7 @@ public class DockerComposeInitializer implements ApplicationContextInitializer<C
4545
);
4646

4747
static String HOST = DockerClientFactory.instance().dockerHostIpAddress();
48-
static DockerComposeContainer container = new DockerComposeContainer(new File(DOCKER_COMPOSE_FILE)).withEnv("HOST", HOST);
48+
static ComposeContainer container = new ComposeContainer(new File(DOCKER_COMPOSE_FILE)).withEnv("HOST", HOST);
4949
static {
5050
for (Service service : SERVICES) {
5151
if("schema-registry".equals(service.name)) {

plugins/backend-application-default/src/main/resources/io/zenwave360/sdk/plugins/BackendApplicationDefaultGenerator/src/test/java/config/DockerComposeInitializer-mongodb.java.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import org.springframework.boot.test.util.TestPropertyValues;
1919
import org.springframework.context.ApplicationContextInitializer;
2020
import org.springframework.context.ConfigurableApplicationContext;
2121
import org.testcontainers.DockerClientFactory;
22-
import org.testcontainers.containers.DockerComposeContainer;
22+
import org.testcontainers.containers.ComposeContainer;
2323
import org.testcontainers.containers.wait.strategy.Wait;
2424

2525
public class DockerComposeInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
@@ -45,7 +45,7 @@ public class DockerComposeInitializer implements ApplicationContextInitializer<C
4545
);
4646

4747
static String HOST = DockerClientFactory.instance().dockerHostIpAddress();
48-
static DockerComposeContainer container = new DockerComposeContainer(new File(DOCKER_COMPOSE_FILE)).withEnv("HOST", HOST);
48+
static ComposeContainer container = new ComposeContainer(new File(DOCKER_COMPOSE_FILE)).withEnv("HOST", HOST);
4949
static {
5050
for (Service service : SERVICES) {
5151
if("schema-registry".equals(service.name)) {

plugins/customizations/kotlin-backend-application/src/main/resources/io/zenwave360/sdk/plugins/kotlin/BackendApplicationDefaultGenerator/src/test/kotlin/config/DockerComposeInitializer-jpa.kt.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.springframework.boot.test.util.TestPropertyValues
1414
import org.springframework.context.ApplicationContextInitializer
1515
import org.springframework.context.ConfigurableApplicationContext
1616
import org.testcontainers.DockerClientFactory
17-
import org.testcontainers.containers.DockerComposeContainer
17+
import org.testcontainers.containers.ComposeContainer
1818
import org.testcontainers.containers.wait.strategy.Wait
1919

2020
class DockerComposeInitializer : ApplicationContextInitializer<ConfigurableApplicationContext> {
@@ -39,7 +39,7 @@ class DockerComposeInitializer : ApplicationContextInitializer<ConfigurableAppli
3939
)
4040

4141
val HOST: String = DockerClientFactory.instance().dockerHostIpAddress()
42-
val container: DockerComposeContainer<*> = DockerComposeContainer(File(DOCKER_COMPOSE_FILE)).withEnv("HOST", HOST)
42+
val container: ComposeContainer = ComposeContainer(File(DOCKER_COMPOSE_FILE)).withEnv("HOST", HOST)
4343

4444
init {
4545
for (service in SERVICES) {

plugins/customizations/kotlin-backend-application/src/main/resources/io/zenwave360/sdk/plugins/kotlin/BackendApplicationDefaultGenerator/src/test/kotlin/config/DockerComposeInitializer-mongodb.kt.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.springframework.boot.test.util.TestPropertyValues
1414
import org.springframework.context.ApplicationContextInitializer
1515
import org.springframework.context.ConfigurableApplicationContext
1616
import org.testcontainers.DockerClientFactory
17-
import org.testcontainers.containers.DockerComposeContainer
17+
import org.testcontainers.containers.ComposeContainer
1818
import org.testcontainers.containers.wait.strategy.Wait
1919

2020
class DockerComposeInitializer : ApplicationContextInitializer<ConfigurableApplicationContext> {
@@ -39,7 +39,7 @@ class DockerComposeInitializer : ApplicationContextInitializer<ConfigurableAppli
3939
)
4040

4141
val HOST: String = DockerClientFactory.instance().dockerHostIpAddress()
42-
val container: DockerComposeContainer<*> = DockerComposeContainer(File(DOCKER_COMPOSE_FILE)).withEnv("HOST", HOST)
42+
val container: ComposeContainer = ComposeContainer(File(DOCKER_COMPOSE_FILE)).withEnv("HOST", HOST)
4343

4444
init {
4545
for (service in SERVICES) {

0 commit comments

Comments
 (0)