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

Merge pull request #1010 from docker/fix-ctrl-c-on-build

Browse Source 
Give progress its own context
This commit is contained in:
Djordje Lukic 2020-12-04 13:22:09 +01:00 committed by GitHub
commit ab8c97d31e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
local/build.go
View File

@ -103,8 +103,15 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opts
Driver: d, Driver: d,
}, },
} }
// Progress needs its own context that lives longer than the
// build one otherwise it won't read all the messages from
// build and will lock
progressCtx, cancel := context.WithCancel(context.Background())
defer cancel()
w := progress.NewPrinter(progressCtx, os.Stdout, "auto")
// We rely on buildx "docker" builder integrated in docker engine, so don't need a DockerAPI here // We rely on buildx "docker" builder integrated in docker engine, so don't need a DockerAPI here
w := progress.NewPrinter(ctx, os.Stdout, "auto")
_, err = build.Build(ctx, driverInfo, opts, nil, nil, w) _, err = build.Build(ctx, driverInfo, opts, nil, nil, w)
return err return err
} }