lint

sreya · sreya · commit ce73172e9ecb · 2025-03-31T03:19:43.000Z
diff --git a/cli/docker.go b/cli/docker.go
@@ -186,6 +186,7 @@ func dockerCmd() *cobra.Command {
 
 			httpClient, err := xhttp.Client(log, flags.extraCertsPath)
 			if err != nil {
+				//nolint
 				return xerrors.Errorf("http client: %w", err)
 			}
 
@@ -395,7 +396,7 @@ func dockerCmd() *cobra.Command {
 				log.Debug(ctx, "killing container", slog.F("bootstrap_pid", bootstrapPID))
 
 				// The PID returned is the PID _outside_ the container...
-				out, err := exec.Command("kill", "-TERM", strconv.Itoa(bootstrapPID)).CombinedOutput()
+				out, err := exec.Command("kill", "-TERM", strconv.Itoa(bootstrapPID)).CombinedOutput() //nolint:gosec
 				if err != nil {
 					log.Error(ctx, "kill bootstrap process", slog.Error(err), slog.F("output", string(out)))
 					return
diff --git a/dockerutil/container.go b/dockerutil/container.go
@@ -106,7 +106,8 @@ func BootstrapContainer(ctx context.Context, client Client, conf BootstrapConfig
 
 	var err error
 	for r, n := retry.New(time.Second, time.Second*2), 0; r.Wait(ctx) && n < 10; n++ {
-		out, err := ExecContainer(ctx, client, ExecConfig{
+		var out []byte
+		out, err = ExecContainer(ctx, client, ExecConfig{
 			ContainerID: conf.ContainerID,
 			User:        conf.User,
 			Cmd:         "/bin/sh",
