-
Notifications
You must be signed in to change notification settings - Fork 565
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)'
Signed-off-by: Hsing-Yu (David) Chen <davidhsingyuchen@gmail.com>
- Loading branch information
1 parent
933c6c3
commit cce73c3
Showing
12 changed files
with
183 additions
and
45 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
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
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
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,64 @@ | ||
| /* | ||
| 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" | ||
|
|
||
| "github.com/moby/term" | ||
| ) | ||
|
|
||
| const DefaultDetachKeys = "ctrl-p,ctrl-q" | ||
|
|
||
| type detachableStdin struct { | ||
| stdin io.Reader | ||
| closer func() | ||
| } | ||
|
|
||
| // 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) { | ||
| n, err := ds.stdin.Read(p) | ||
| var eerr term.EscapeError | ||
| if errors.As(err, &eerr) { | ||
| if ds.closer != nil { | ||
| ds.closer() | ||
| } | ||
| // TODO (before merging this PR): Return a nil error instead after https://github.com/containerd/containerd/issues/8326 is fixed. | ||
| // Returning an error for now to avoid debug logs overflowing my screen. | ||
| // return n, nil | ||
| return n, err | ||
| } | ||
| 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
Oops, something went wrong.