1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6058 from thaJeztah/restore_terminal

Browse Source 
restore terminal when terminating after 3 signals
This commit is contained in:
Sebastiaan van Stijn 2025-05-12 10:35:20 +02:00 committed by GitHub
commit dd4536e4d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/docker/docker.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"io"
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
@ -341,6 +340,9 @@ func tryPluginRun(ctx context.Context, dockerCli command.Cli, cmd *cobra.Command
if force { if force {
_ = plugincmd.Process.Kill() _ = plugincmd.Process.Kill()
_, _ = fmt.Fprint(dockerCli.Err(), "got 3 SIGTERM/SIGINTs, forcefully exiting\n") _, _ = fmt.Fprint(dockerCli.Err(), "got 3 SIGTERM/SIGINTs, forcefully exiting\n")
// Restore terminal in case it was in raw mode.
restoreTerminal(dockerCli)
os.Exit(1) os.Exit(1)
} }
} }
@ -388,7 +390,7 @@ func tryPluginRun(ctx context.Context, dockerCli command.Cli, cmd *cobra.Command
// to be caught and the context to be marked as done, then registers a new // to be caught and the context to be marked as done, then registers a new
// signal handler for subsequent signals. It forces the process to exit // signal handler for subsequent signals. It forces the process to exit
// after 3 SIGTERM/SIGINT signals. // after 3 SIGTERM/SIGINT signals.
func forceExitAfter3TerminationSignals(ctx context.Context, w io.Writer) { func forceExitAfter3TerminationSignals(ctx context.Context, streams command.Streams) {
// wait for the first signal to be caught and the context to be marked as done // wait for the first signal to be caught and the context to be marked as done
<-ctx.Done() <-ctx.Done()
// register a new signal handler for subsequent signals // register a new signal handler for subsequent signals
@ -399,10 +401,22 @@ func forceExitAfter3TerminationSignals(ctx context.Context, w io.Writer) {
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
<-sig <-sig
} }
_, _ = fmt.Fprint(w, "\ngot 3 SIGTERM/SIGINTs, forcefully exiting\n") _, _ = fmt.Fprint(streams.Err(), "\ngot 3 SIGTERM/SIGINTs, forcefully exiting\n")
// Restore terminal in case it was in raw mode.
restoreTerminal(streams)
os.Exit(1) os.Exit(1)
} }
// restoreTerminal restores the terminal if it was in raw mode; this prevents
// local echo from being disabled for the current terminal after forceful
// termination. It's a no-op if there's no prior state to restore.
func restoreTerminal(streams command.Streams) {
streams.In().RestoreTerminal()
streams.Out().RestoreTerminal()
streams.Err().RestoreTerminal()
}
//nolint:gocyclo //nolint:gocyclo
func runDocker(ctx context.Context, dockerCli *command.DockerCli) error { func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
tcmd := newDockerCommand(dockerCli) tcmd := newDockerCommand(dockerCli)
@ -468,7 +482,7 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
// This is a fallback for the case where the command does not exit // This is a fallback for the case where the command does not exit
// based on context cancellation. // based on context cancellation.
go forceExitAfter3TerminationSignals(ctx, dockerCli.Err()) go forceExitAfter3TerminationSignals(ctx, dockerCli)
// We've parsed global args already, so reset args to those // We've parsed global args already, so reset args to those
// which remain. // which remain.