Add support for Docker Compose V2 generated container names and compo…

…se-file specified container names

compose.go

@@ -142,11 +142,12 @@ func (dc *LocalDockerCompose) applyStrategyToRunningContainer() error {
 	}
 
 	for k := range dc.WaitStrategyMap {
-		// TODO: if the compose file includes a container_name, this won't work,
-		// as we cannot delegate to the names generated by Docker Compose
 		containerName := dc.Identifier + "_" + k.service
-		// Docker compose appends "_1" to every started service by default. Trimming to match running docker container
-		f := filters.NewArgs(filters.Arg("name", containerName))
+		composeV2ContainerName := strings.ReplaceAll(containerName, "_", "-")
+		f := filters.NewArgs(
+			filters.Arg("name", containerName),
+			filters.Arg("name", composeV2ContainerName),
+			filters.Arg("name", k.service))
 		containerListOptions := types.ContainerListOptions{Filters: f}
 		containers, err := cli.ContainerList(context.Background(), containerListOptions)
 		if err != nil {

compose_test.go

@@ -204,6 +204,31 @@ func TestDockerComposeWithWaitHTTPStrategy(t *testing.T) {
 	assert.Contains(t, compose.Services, "nginx")
 }
 
+func TestDockerComposeWithContainerName(t *testing.T) {
+	path := "./testresources/docker-compose-container-name.yml"
+
+	identifier := strings.ToLower(uuid.New().String())
+
+	compose := NewLocalDockerCompose([]string{path}, identifier)
+	destroyFn := func() {
+		err := compose.Down()
+		checkIfError(t, err)
+	}
+	defer destroyFn()
+
+	err := compose.
+		WithCommand([]string{"up", "-d"}).
+		WithEnv(map[string]string{
+			"bar": "BAR",
+		}).
+		WithExposedService("nginxy", 9080, wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+		Invoke()
+	checkIfError(t, err)
+
+	assert.Equal(t, 1, len(compose.Services))
+	assert.Contains(t, compose.Services, "nginx")
+}
+
 func TestDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
 	path := "./testresources/docker-compose-no-exposed-ports.yml"
 

testresources/docker-compose-container-name.yml

@@ -0,0 +1,9 @@
+version: '3'
+services:
+  nginx:
+    container_name: nginxy
+    image: nginx:stable-alpine
+    environment:
+      bar: ${bar}
+    ports:
+     - "9080:80"