Cleanup using labels instead of name prefix

dockerutil/kill.go

@@ -2,24 +2,36 @@ package dockerutil
 
 import (
 	"context"
+	"os"
 	"strings"
 
 	dockerapitypes "github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"
 )
 
 // KillAllInterchaintestContainers kills all containers that are prefixed with interchaintest specific container names.
 // This can be called during cleanup, which is especially useful when running tests which fail to cleanup after themselves.
 // Specifically, on failed ic.Build(...) calls.
 func KillAllInterchaintestContainers(ctx context.Context) []string {
+	if os.Getenv("KEEP_CONTAINERS") != "" {
+		return nil
+	}
+
 	removedContainers := []string{}
 
 	cli, err := client.NewClientWithOpts(client.FromEnv)
 	if err != nil {
 		panic(err)
 	}
 
-	containers, err := cli.ContainerList(ctx, dockerapitypes.ContainerListOptions{})
+	containers, err := cli.ContainerList(ctx, dockerapitypes.ContainerListOptions{
+		// grabs only running containers
+		All: false,
+		Filters: filters.NewArgs(
+			filters.Arg("label", CleanupLabel),
+		),
+	})
 	if err != nil {
 		panic(err)
 	}
@@ -32,11 +44,6 @@ func KillAllInterchaintestContainers(ctx context.Context) []string {
 		name := strings.ToLower(container.Names[0])
 		name = strings.TrimPrefix(name, "/")
 
-		// leave non ict relayed containers running
-		if !(strings.HasPrefix(name, ICTDockerPrefix) || strings.HasPrefix(name, RelayerDockerPrefix)) {
-			continue
-		}
-
 		inspected, err := cli.ContainerInspect(ctx, container.ID)
 		if err != nil {
 			panic(err)