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

fix panic on failure starting plugin server 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-06-06 18:24:07 +02:00 committed by Guillaume Lours
parent 1d34661e91
commit 63b06f5563
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/compose/build_bake.go
View File

@ -295,9 +295,8 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
// Use docker/cli mechanism to propagate termination signal to child process // Use docker/cli mechanism to propagate termination signal to child process
server, err := socket.NewPluginServer(nil) server, err := socket.NewPluginServer(nil)
if err != nil { if err == nil {
defer server.Close() //nolint:errcheck defer server.Close() //nolint:errcheck
cmd.Cancel = server.Close
cmd.Env = replace(cmd.Env, socket.EnvKey, server.Addr().String()) cmd.Env = replace(cmd.Env, socket.EnvKey, server.Addr().String())
} }

1
pkg/compose/plugins.go
View File

@ -207,7 +207,6 @@ func (s *composeService) setupPluginCommand(ctx context.Context, project *types.
server, err := socket.NewPluginServer(nil) server, err := socket.NewPluginServer(nil)
if err == nil { if err == nil {
defer server.Close() //nolint:errcheck defer server.Close() //nolint:errcheck
cmd.Cancel = server.Close
cmd.Env = replace(cmd.Env, socket.EnvKey, server.Addr().String()) cmd.Env = replace(cmd.Env, socket.EnvKey, server.Addr().String())
} }