-
Notifications
You must be signed in to change notification settings - Fork 566
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support '--detach-keys' for 'nerdctl (run|start|exec)'
- Loading branch information
1 parent
ea92fda
commit 1b2898a
Showing
4 changed files
with
102 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| Copyright The containerd Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package consoleutil | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "io" | ||
| "sync" | ||
| "syscall" | ||
|
|
||
| "github.com/moby/term" | ||
| ) | ||
|
|
||
| var defaultDetachKeys = "ctrl-p,ctrl-q" | ||
|
|
||
| type detachableStdin struct { | ||
| stdin io.Reader | ||
| closer func() | ||
| mu sync.Mutex | ||
| closed bool | ||
| } | ||
|
|
||
| // NewDetachableStdin returns a new TTY proxy reader | ||
| // which wraps stdin and detects when the specified detach keys are read, | ||
| // in which case closer will be called. | ||
| func NewDetachableStdin(stdin io.Reader, keys string, closer func()) (io.Reader, error) { | ||
| if len(keys) == 0 { | ||
| keys = defaultDetachKeys | ||
| } | ||
| b, err := term.ToBytes(keys) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to convert the detach keys to bytes: %w", err) | ||
| } | ||
| return &detachableStdin{ | ||
| stdin: term.NewEscapeProxy(stdin, b), | ||
| closer: closer, | ||
| }, nil | ||
| } | ||
|
|
||
| func (ds *detachableStdin) Read(p []byte) (int, error) { | ||
| ds.mu.Lock() | ||
| defer ds.mu.Unlock() | ||
| if ds.closed { | ||
| return 0, syscall.EBADF | ||
| } | ||
|
|
||
| n, err := ds.stdin.Read(p) | ||
| var eerr term.EscapeError | ||
| if errors.As(err, &eerr) { | ||
| if ds.closer != nil { | ||
| ds.closer() | ||
| } | ||
| ds.closed = true | ||
| return n, nil | ||
| } | ||
| return n, err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters