Fix corner case when there's no container to attach to

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
docker · Dec 9, 2022 · 8f991a2 · 8f991a2
1 parent 0234e13
commit 8f991a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/compose/attach.go b/pkg/compose/attach.go
@@ -37,6 +37,9 @@ func (s *composeService) attach(ctx context.Context, project *types.Project, lis
 	if err != nil {
 		return nil, err
 	}
+	if len(containers) == 0 {
+		return containers, nil
+	}
 
 	containers.sorted() // This enforce predictable colors assignment
 

diff --git a/pkg/compose/start.go b/pkg/compose/start.go
@@ -110,8 +110,12 @@ func getDependencyCondition(service types.ServiceConfig, project *types.Project)
 type containerWatchFn func(container moby.Container) error
 
 // watchContainers uses engine events to capture container start/die and notify ContainerEventListener
-func (s *composeService) watchContainers(ctx context.Context, projectName string, services, required []string,
+func (s *composeService) watchContainers(ctx context.Context, //nolint:gocyclo
+	projectName string, services, required []string,
 	listener api.ContainerEventListener, containers Containers, onStart containerWatchFn) error {
+	if len(containers) == 0 {
+		return nil
+	}
 	if len(required) == 0 {
 		required = services
 	}