tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 07:34:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

run ContainerWait in background so we catch container exit

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-03-22 16:31:10 +01:00
parent 83475569e6
commit 9af5ea4b6a
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local/compose/attach.go
View File

@ -83,7 +83,7 @@ func (s *composeService) attach(ctx context.Context, project *types.Project, lis
s.attachContainer(ctx, container, listener, project) // nolint: errcheck s.attachContainer(ctx, container, listener, project) // nolint: errcheck
delete(crashed, event.Container) delete(crashed, event.Container)
s.waitContainer(ctx, container, listener) s.waitContainer(container, listener)
} }
return nil return nil
}, },

6
local/compose/start.go
View File

@ -51,14 +51,14 @@ func (s *composeService) Start(ctx context.Context, project *types.Project, opti
for _, c := range containers { for _, c := range containers {
c := c c := c
go func() { go func() {
s.waitContainer(ctx, c, options.Attach) s.waitContainer(c, options.Attach)
}() }()
} }
return nil return nil
} }
func (s *composeService) waitContainer(ctx context.Context, c moby.Container, listener compose.ContainerEventListener) { func (s *composeService) waitContainer(c moby.Container, listener compose.ContainerEventListener) {
statusC, errC := s.apiClient.ContainerWait(ctx, c.ID, container.WaitConditionNotRunning) statusC, errC := s.apiClient.ContainerWait(context.Background(), c.ID, container.WaitConditionNotRunning)
name := getContainerNameWithoutProject(c) name := getContainerNameWithoutProject(c)
select { select {
case status := <-statusC: case status := <-statusC: