mroot/lazydocker
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazydocker.git synced 2026-07-25 08:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

some fixes

Browse source
This commit is contained in:
Dawid Dziurla 2019-07-08 15:35:34 +02:00
parent 7a78175eff
commit 5223c786e1
No known key found for this signature in database
GPG key ID: 7B6D8368172E9B0B
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/commands/container.go
View file

@ -361,12 +361,14 @@ func (c *Container) Attach() error {
Stdin: c.Details.Config.OpenStdin, Stdin: c.Details.Config.OpenStdin,
Stdout: true, Stdout: true,
Stderr: true, Stderr: true,
Logs: true,
} }
hijack, err := c.Client.ContainerAttach(context.Background(), c.ID, options) hijack, err := c.Client.ContainerAttach(context.Background(), c.ID, options)
if err != nil { if err != nil {
return err return err
} }
defer hijack.Close()
if c.Details.Config.OpenStdin { if c.Details.Config.OpenStdin {
fd := int(os.Stdin.Fd()) fd := int(os.Stdin.Fd())
@ -388,18 +390,19 @@ func (c *Container) Attach() error {
return err return err
} }
hijack.Close()
return nil return nil
} }
func (c *Container) resizeIfChanged(fd int) { func (c *Container) resizeIfChanged(fd int) {
channel := make(chan os.Signal) channel := make(chan os.Signal, 1)
signal.Notify(channel, syscall.SIGWINCH) signal.Notify(channel, syscall.SIGWINCH)
for { for {
<-channel <-channel
c.Resize(fd) err := c.Resize(fd)
if err != nil {
return
}
} }
} }

4
pkg/gui/containers_panel.go
View file

@ -472,9 +472,7 @@ func (gui *Gui) handleContainerAttach(g *gocui.Gui, v *gocui.View) error {
return gui.createErrorPanel(gui.g, err.Error()) return gui.createErrorPanel(gui.g, err.Error())
} }
gui.RunWithSubprocesses() return nil
return gui.Errors.ErrSubProcess
} }
func (gui *Gui) handlePruneContainers(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handlePruneContainers(g *gocui.Gui, v *gocui.View) error {