pkg/build: shutdown bazel in case of errors too

1 files changed, 2 insertions, 1 deletions

diff --git a/pkg/build/gvisor.go b/pkg/build/gvisor.go
index 439e64c3b..a2a856dd8 100644
--- a/pkg/build/gvisor.go
+++ b/pkg/build/gvisor.go
@@ -15,6 +15,8 @@ type gvisor struct{}
 
 func (gvisor gvisor) build(targetArch, vmType, kernelDir, outputDir, compiler, userspaceDir,
 	cmdlineFile, sysctlFile string, config []byte) error {
+	// Bring down bazel daemon right away. We don't need it running and consuming memory.
+	defer osutil.RunCmd(10*time.Minute, kernelDir, compiler, "shutdown")
 	outBinary := ""
 	args := []string{"build", "--verbose_failures"}
 	if strings.Contains(" "+string(config)+" ", " -race ") {
@@ -31,7 +33,6 @@ func (gvisor gvisor) build(targetArch, vmType, kernelDir, outputDir, compiler, u
 	if err := osutil.CopyFile(outBinary, filepath.Join(outputDir, "image")); err != nil {
 		return err
 	}
-	osutil.RunCmd(10*time.Minute, kernelDir, compiler, "shutdown")
 	return nil
 }