chore: cleanup baseCtx and ctx usage

Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>

Author: Benehiko

cli/command/container/attach.go

@@ -107,10 +107,9 @@ func RunAttach(ctx context.Context, dockerCLI command.Cli, containerID string, o
 		sigc := notifyAllSignals()
 		// since the ForwardAllSignals already registers its own signal handler
 		// and should notify the daemon independently of the clients ctx cancellation
-		// we should use a background context to avoid the ForwardAllSignals from
+		// we should use the context without cancellation to avoid the ForwardAllSignals from
 		// returning before all signals are forwarded to the daemon
-		bgCtx, cancel := context.WithCancel(context.Background())
-		defer cancel()
+		bgCtx := context.WithoutCancel(ctx)
 		go ForwardAllSignals(bgCtx, apiClient, containerID, sigc)
 		defer signal.StopCatch(sigc)
 	}

cli/command/container/run.go

@@ -152,10 +152,9 @@ func runContainer(ctx context.Context, dockerCli command.Cli, runOpts *runOption
 		sigc := notifyAllSignals()
 		// since the ForwardAllSignals already registers its own signal handler
 		// and should notify the daemon independently of the clients ctx cancellation
-		// we should use a background context to avoid the ForwardAllSignals from
+		// we should use the context without cancellation to avoid the ForwardAllSignals from
 		// returning before all signals are forwarded to the daemon
-		bgCtx, cancel := context.WithCancel(context.Background())
-		defer cancel()
+		bgCtx := context.WithoutCancel(ctx)
 		go ForwardAllSignals(bgCtx, apiClient, containerID, sigc)
 		defer signal.StopCatch(sigc)
 	}

cli/command/container/signals.go

@@ -14,20 +14,7 @@ import (
 //
 // The channel you pass in must already be setup to receive any signals you want to forward.
 func ForwardAllSignals(ctx context.Context, apiClient client.ContainerAPIClient, cid string, sigc <-chan os.Signal) {
-	var (
-		s  os.Signal
-		ok bool
-	)
-	for {
-		select {
-		case s, ok = <-sigc:
-			if !ok {
-				return
-			}
-		case <-ctx.Done():
-			return
-		}
-
+	for s := range sigc {
 		if s == signal.SIGCHLD || s == signal.SIGPIPE {
 			continue
 		}

cmd/docker/docker.go

@@ -28,10 +28,7 @@ import (
 )
 
 func main() {
-	baseCtx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	ctx, cancelNotify := signal.NotifyContext(baseCtx, platformsignals.TerminationSignals...)
+	ctx, cancelNotify := signal.NotifyContext(context.Background(), platformsignals.TerminationSignals...)
 	defer cancelNotify()
 
 	dockerCli, err := command.NewDockerCli(command.WithBaseContext(ctx))
@@ -273,11 +270,8 @@ func tryPluginRun(ctx context.Context, dockerCli command.Cli, cmd *cobra.Command
 		// or EBADF; but that is fine for our purposes.
 		_ = srv.Close()
 
-		// If we're still running after 3 interruptions
-		// (SIGINT/SIGTERM), send a SIGKILL to the plugin as a
-		// final attempt to terminate, and exit.
+		// force the process to terminate if it hasn't already
 		if force {
-			_, _ = fmt.Fprint(dockerCli.Err(), "got 3 SIGTERM/SIGINTs, forcefully exiting\n")
 			_ = plugincmd.Process.Kill()
 			os.Exit(1)
 		}
@@ -301,6 +295,7 @@ func tryPluginRun(ctx context.Context, dockerCli command.Cli, cmd *cobra.Command
 			// final attempt to terminate, and exit.
 			if retries >= exitLimit {
 				force = true
+				_, _ = fmt.Fprint(dockerCli.Err(), "got 3 SIGTERM/SIGINTs, forcefully exiting\n")
 			}
 			tryTerminatePlugin(force)
 		}