tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2022-12-08 18:53:47 +01:00 committed by Nicolas De loof
parent 0234e13454
commit 8f991a20db
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/compose/attach.go
View File

@ -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

6
pkg/compose/start.go
View File

@ -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
}