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

using as flag of the up command, watch was blocking process shutdown 

This happened when sunsetting the application from docker compose down command

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
This commit is contained in:
Guillaume Lours 2024-06-18 17:45:16 +02:00 committed by Nicolas De loof
parent de478f84b0
commit e1fd7a6567
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/compose/watch.go
View File

@ -183,15 +183,13 @@ func (s *composeService) watch(ctx context.Context, syncChannel chan bool, proje
} }
options.LogTo.Log(api.WatchLogger, "Watch enabled") options.LogTo.Log(api.WatchLogger, "Watch enabled")
err = eg.Wait()
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
return err return eg.Wait()
case <-syncChannel: case <-syncChannel:
options.LogTo.Log(api.WatchLogger, "Watch disabled") options.LogTo.Log(api.WatchLogger, "Watch disabled")
ctx.Done() return nil
return err
} }
} }
} }