From 63b06f556330e2f55fffba51c67696125e5478f1 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Fri, 6 Jun 2025 18:24:07 +0200 Subject: [PATCH] fix panic on failure starting plugin server Signed-off-by: Nicolas De Loof --- pkg/compose/build_bake.go | 3 +-- pkg/compose/plugins.go | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/compose/build_bake.go b/pkg/compose/build_bake.go index 51a37771f..83624f3dc 100644 --- a/pkg/compose/build_bake.go +++ b/pkg/compose/build_bake.go @@ -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 server, err := socket.NewPluginServer(nil) - if err != nil { + if err == nil { defer server.Close() //nolint:errcheck - cmd.Cancel = server.Close cmd.Env = replace(cmd.Env, socket.EnvKey, server.Addr().String()) } diff --git a/pkg/compose/plugins.go b/pkg/compose/plugins.go index 756a4b09e..66cfc53fc 100644 --- a/pkg/compose/plugins.go +++ b/pkg/compose/plugins.go @@ -207,7 +207,6 @@ func (s *composeService) setupPluginCommand(ctx context.Context, project *types. server, err := socket.NewPluginServer(nil) if err == nil { defer server.Close() //nolint:errcheck - cmd.Cancel = server.Close cmd.Env = replace(cmd.Env, socket.EnvKey, server.Addr().String()) }