-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix create bug when .ch.yaml not present. Closes #7
- Loading branch information
1 parent
57fad95
commit ddc932b
Showing
4 changed files
with
119 additions
and
42 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package util | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| gosignal "os/signal" | ||
| "runtime" | ||
| "time" | ||
|
|
||
| "github.com/docker/docker/api/types" | ||
| "github.com/docker/docker/pkg/signal" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| // resizeTtyTo resizes tty to specific height and width | ||
| func resizeTtyTo(ctx context.Context, client DockerAPI, id string, height, width uint, isExec bool) error { | ||
| if height == 0 && width == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| options := types.ResizeOptions{ | ||
| Height: height, | ||
| Width: width, | ||
| } | ||
|
|
||
| var err error | ||
| if isExec { | ||
| err = client.ContainerExecResize(ctx, id, options) | ||
| } else { | ||
| err = client.ContainerResize(ctx, id, options) | ||
| } | ||
|
|
||
| if err != nil { | ||
| logrus.Debugf("Error resize: %s\r", err) | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| // resizeTty is to resize the tty with cli out's tty size | ||
| func resizeTty(ctx context.Context, cli ContainerClient, id string, isExec bool) error { | ||
| height, width := cli.Out().GetTtySize() | ||
| return resizeTtyTo(ctx, cli.ApiClient(), id, height, width, isExec) | ||
| } | ||
|
|
||
| // initTtySize is to init the tty's size to the same as the window, if there is an error, it will retry 5 times. | ||
| func initTtySize(ctx context.Context, cli ContainerClient, id string, isExec bool, resizeTtyFunc func(ctx context.Context, cli ContainerClient, id string, isExec bool) error) { | ||
| rttyFunc := resizeTtyFunc | ||
| if rttyFunc == nil { | ||
| rttyFunc = resizeTty | ||
| } | ||
| if err := rttyFunc(ctx, cli, id, isExec); err != nil { | ||
| go func() { | ||
| var err error | ||
| for retry := 0; retry < 5; retry++ { | ||
| time.Sleep(10 * time.Millisecond) | ||
| if err = rttyFunc(ctx, cli, id, isExec); err == nil { | ||
| break | ||
| } | ||
| } | ||
| if err != nil { | ||
| fmt.Fprintln(cli.Err(), "failed to resize tty, using default size") | ||
| } | ||
| }() | ||
| } | ||
| } | ||
|
|
||
| // MonitorTtySize updates the container tty size when the terminal tty changes size | ||
| func MonitorTtySize(ctx context.Context, cli ContainerClient, id string, isExec bool) error { | ||
| initTtySize(ctx, cli, id, isExec, resizeTty) | ||
| if runtime.GOOS == "windows" { | ||
| go func() { | ||
| prevH, prevW := cli.Out().GetTtySize() | ||
| for { | ||
| time.Sleep(time.Millisecond * 250) | ||
| h, w := cli.Out().GetTtySize() | ||
|
|
||
| if prevW != w || prevH != h { | ||
| resizeTty(ctx, cli, id, isExec) | ||
| } | ||
| prevH = h | ||
| prevW = w | ||
| } | ||
| }() | ||
| } else { | ||
| sigchan := make(chan os.Signal, 1) | ||
| gosignal.Notify(sigchan, signal.SIGWINCH) | ||
| go func() { | ||
| for range sigchan { | ||
| resizeTty(ctx, cli, id, isExec) | ||
| } | ||
| }() | ||
| } | ||
| return nil | ||
| } |