Przeglądaj źródła

fix panic on failure starting plugin server

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 7 miesięcy temu
rodzic
commit
63b06f5563
2 zmienionych plików z 1 dodań i 3 usunięć
  1. 1 2
      pkg/compose/build_bake.go
  2. 0 1
      pkg/compose/plugins.go

+ 1 - 2
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
 	// 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())
 	}
 	}
 
 

+ 0 - 1
pkg/compose/plugins.go

@@ -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())
 	}
 	}