Skip to content

Commit 63b06f5

Browse files
ndeloofglours
authored andcommitted
fix panic on failure starting plugin server
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 1d34661 commit 63b06f5

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

pkg/compose/build_bake.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,8 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
295295

296296
// Use docker/cli mechanism to propagate termination signal to child process
297297
server, err := socket.NewPluginServer(nil)
298-
if err != nil {
298+
if err == nil {
299299
defer server.Close() //nolint:errcheck
300-
cmd.Cancel = server.Close
301300
cmd.Env = replace(cmd.Env, socket.EnvKey, server.Addr().String())
302301
}
303302

pkg/compose/plugins.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ func (s *composeService) setupPluginCommand(ctx context.Context, project *types.
207207
server, err := socket.NewPluginServer(nil)
208208
if err == nil {
209209
defer server.Close() //nolint:errcheck
210-
cmd.Cancel = server.Close
211210
cmd.Env = replace(cmd.Env, socket.EnvKey, server.Addr().String())
212211
}
213212

0 commit comments

Comments
 (0)