Clear docker compose initialization (#9370)

Currently, an instance of `DockerComposeContainer` and `ComposeContainer`
keep information from previous initialization which causes issues when
running the instance more than once.

Fixes #7443

---------

Co-authored-by: jenodekeyzer <[email protected]>

Author: eddumelendez

core/src/main/java/org/testcontainers/containers/ComposeCommand.java

@@ -1,14 +1,12 @@
 package org.testcontainers.containers;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.Set;
 
 class ComposeCommand {
 
     static String getDownCommand(ComposeDelegate.ComposeVersion composeVersion, Set<String> options) {
         String composeOptions = optionsAsString(options);
-        if (composeOptions == null || composeOptions.equals("")) {
+        if (composeOptions.isEmpty()) {
             return composeVersion == ComposeDelegate.ComposeVersion.V1 ? "down" : "compose down";
         }
         String cmd = composeVersion == ComposeDelegate.ComposeVersion.V1 ? "%s down" : "compose %s down";
@@ -17,7 +15,7 @@ static String getDownCommand(ComposeDelegate.ComposeVersion composeVersion, Set<
 
     static String getUpCommand(ComposeDelegate.ComposeVersion composeVersion, Set<String> options) {
         String composeOptions = optionsAsString(options);
-        if (composeOptions == null || composeOptions.equals("")) {
+        if (composeOptions.isEmpty()) {
             return composeVersion == ComposeDelegate.ComposeVersion.V1 ? "up -d" : "compose up -d";
         }
         String cmd = composeVersion == ComposeDelegate.ComposeVersion.V1 ? "%s up -d" : "compose %s up -d";
@@ -31,7 +29,7 @@ private static String optionsAsString(final Set<String> options) {
             return optionsString;
         } else {
             // otherwise two spaces would appear between 'docker-compose' and 'up'
-            return StringUtils.EMPTY;
+            return "";
         }
     }
 }

core/src/main/java/org/testcontainers/containers/ComposeContainer.java

@@ -171,6 +171,7 @@ public void stop() {
                 }
                 this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env, this.filesInDirectory);
             } finally {
+                this.composeDelegate.clear();
                 this.project = this.composeDelegate.randomProjectId();
             }
         }

core/src/main/java/org/testcontainers/containers/ComposeDelegate.java

@@ -386,6 +386,13 @@ String getServiceHost() {
         return this.ambassadorContainer.getHost();
     }
 
+    void clear() {
+        this.logConsumers.clear();
+        this.ambassadorPortMappings.clear();
+        this.serviceInstanceMap.clear();
+        this.waitStrategyMap.clear();
+    }
+
     enum ComposeVersion {
         V1("_"),
 

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -177,6 +177,7 @@ public void stop() {
                 }
                 this.composeDelegate.runWithCompose(this.localCompose, cmd, this.env, this.filesInDirectory);
             } finally {
+                this.composeDelegate.clear();
                 this.project = this.composeDelegate.randomProjectId();
             }
         }

core/src/test/java/org/testcontainers/containers/ComposeContainerWithServicesTest.java

@@ -23,6 +23,10 @@ public class ComposeContainerWithServicesTest {
         "src/test/resources/compose-with-inline-scale-test.yml"
     );
 
+    public static final File COMPOSE_FILE_WITH_HEALTHCHECK = new File(
+        "src/test/resources/docker-compose-healthcheck.yml"
+    );
+
     @Test
     public void testDesiredSubsetOfServicesAreStarted() {
         try (ComposeContainer compose = new ComposeContainer(SIMPLE_COMPOSE_FILE).withServices("redis")) {
@@ -108,6 +112,32 @@ public void testStartupTimeoutSetsTheHighestTimeout() {
             .isInstanceOf(TimeoutException.class);
     }
 
+    @Test
+    public void testWaitingForHealthcheck() {
+        try (
+            ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_HEALTHCHECK)
+                .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1");
+        }
+    }
+
+    @Test
+    public void testWaitingForHealthcheckWithRestartDoesNotCrash() {
+        try (
+            ComposeContainer compose = new ComposeContainer(COMPOSE_FILE_WITH_HEALTHCHECK)
+                .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
+        ) {
+            compose.start();
+            compose.stop();
+            compose.start();
+
+            verifyStartedContainers(compose, "redis-1");
+        }
+    }
+
     private void verifyStartedContainers(final ComposeContainer compose, final String... names) {
         final List<String> containerNames = compose
             .listChildContainers()

core/src/test/java/org/testcontainers/containers/DockerComposeContainerWithServicesTest.java

@@ -23,6 +23,10 @@ public class DockerComposeContainerWithServicesTest {
         "src/test/resources/compose-with-inline-scale-test.yml"
     );
 
+    public static final File COMPOSE_FILE_WITH_HEALTHCHECK = new File(
+        "src/test/resources/docker-compose-healthcheck.yml"
+    );
+
     @Test
     public void testDesiredSubsetOfServicesAreStarted() {
         try (
@@ -113,6 +117,32 @@ public void testStartupTimeoutSetsTheHighestTimeout() {
             .isInstanceOf(TimeoutException.class);
     }
 
+    @Test
+    public void testWaitingForHealthcheck() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_HEALTHCHECK)
+                .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(2)))
+        ) {
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1");
+        }
+    }
+
+    @Test
+    public void testWaitingForHealthcheckWithRestartDoesNotCrash() {
+        try (
+            DockerComposeContainer<?> compose = new DockerComposeContainer<>(COMPOSE_FILE_WITH_HEALTHCHECK)
+                .waitingFor("redis", Wait.forHealthcheck().withStartupTimeout(Duration.ofMinutes(1)))
+        ) {
+            compose.start();
+            compose.stop();
+            compose.start();
+
+            verifyStartedContainers(compose, "redis_1");
+        }
+    }
+
     private void verifyStartedContainers(final DockerComposeContainer<?> compose, final String... names) {
         final List<String> containerNames = compose
             .listChildContainers()

core/src/test/resources/docker-compose-healthcheck.yml

@@ -0,0 +1,6 @@
+version: "3.9"
+services:
+  redis:
+    image: redis:alpine
+    healthcheck:
+      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]