mirror of
https://github.com/jesseduffield/lazydocker.git
synced 2024-10-06 01:17:33 +03:00
Merge 02c86b1994
into de40167712
This commit is contained in:
commit
9c128e8a2a
@ -59,6 +59,12 @@ func (c *Container) Remove(options container.RemoveOptions) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Start starts the container
|
||||
func (c *Container) Start() error {
|
||||
c.Log.Warn(fmt.Sprintf("starting container %s", c.Name))
|
||||
return c.Client.ContainerStart(context.Background(), c.ID, container.StartOptions{})
|
||||
}
|
||||
|
||||
// Stop stops the container
|
||||
func (c *Container) Stop() error {
|
||||
c.Log.Warn(fmt.Sprintf("stopping container %s", c.Name))
|
||||
|
@ -220,6 +220,9 @@ type CommandTemplatesConfig struct {
|
||||
|
||||
// ServiceTop is the command for viewing the processes under a given service
|
||||
ServiceTop string `yaml:"serviceTop,omitempty"`
|
||||
|
||||
// List of shells that, in given order, will be tried when attaching to a container.
|
||||
PreferredExecShells []string `yaml:"preferedExecShell,omitempty"`
|
||||
}
|
||||
|
||||
// OSConfig contains config on the level of the os
|
||||
@ -402,6 +405,7 @@ func GetDefaultConfig() UserConfig {
|
||||
DockerComposeConfig: "{{ .DockerCompose }} config",
|
||||
CheckDockerComposeConfig: "{{ .DockerCompose }} config --quiet",
|
||||
ServiceTop: "{{ .DockerCompose }} top {{ .Service.Name }}",
|
||||
PreferredExecShells: []string{},
|
||||
},
|
||||
CustomCommands: CustomCommands{
|
||||
Containers: []CustomCommand{},
|
||||
|
@ -342,6 +342,8 @@ func (gui *Gui) handleContainersRemoveMenu(g *gocui.Gui, v *gocui.View) error {
|
||||
})
|
||||
}
|
||||
|
||||
// TODO: do same thing for start
|
||||
// Fix UI not showing it being paused (it should say unpaused)
|
||||
func (gui *Gui) PauseContainer(container *commands.Container) error {
|
||||
return gui.WithWaitingStatus(gui.Tr.PausingStatus, func() (err error) {
|
||||
if container.Details.State.Paused {
|
||||
@ -367,12 +369,22 @@ func (gui *Gui) handleContainerPause(g *gocui.Gui, v *gocui.View) error {
|
||||
return gui.PauseContainer(ctr)
|
||||
}
|
||||
|
||||
func (gui *Gui) handleContainerStop(g *gocui.Gui, v *gocui.View) error {
|
||||
func (gui *Gui) handleContainerStartStop(g *gocui.Gui, v *gocui.View) error {
|
||||
ctr, err := gui.Panels.Containers.GetSelectedItem()
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
if !(ctr.Container.State == "exited" || ctr.Container.State == "running") {
|
||||
return gui.createErrorPanel(gui.Tr.CannotStartStop)
|
||||
}
|
||||
|
||||
if ctr.Container.State == "exited" {
|
||||
return gui.WithWaitingStatus(gui.Tr.StoppingStatus, func() error {
|
||||
return ctr.Start()
|
||||
})
|
||||
}
|
||||
|
||||
return gui.createConfirmationPanel(gui.Tr.Confirm, gui.Tr.StopContainer, func(g *gocui.Gui, v *gocui.View) error {
|
||||
return gui.WithWaitingStatus(gui.Tr.StoppingStatus, func() error {
|
||||
if err := ctr.Stop(); err != nil {
|
||||
@ -449,11 +461,32 @@ func (gui *Gui) containerExecShell(container *commands.Container) error {
|
||||
commandObject := gui.DockerCommand.NewCommandObject(commands.CommandObject{
|
||||
Container: container,
|
||||
})
|
||||
var command string
|
||||
shell := ""
|
||||
|
||||
preferredExecShells := gui.Config.UserConfig.CommandTemplates.PreferredExecShells
|
||||
if len(preferredExecShells) > 0 {
|
||||
for _, preferredExecShell := range preferredExecShells {
|
||||
command := utils.ApplyTemplate(fmt.Sprintf("docker exec {{ .Container.ID }} which %s", preferredExecShell), commandObject)
|
||||
|
||||
err := gui.runCommandSilently(gui.OSCommand.ExecutableFromString(command))
|
||||
if err == nil {
|
||||
shell = preferredExecShell
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Use SDK
|
||||
// Use default implementation in case we cannot fulfill user's preference
|
||||
if shell == "" {
|
||||
command = utils.ApplyTemplate("docker exec -it {{ .Container.ID }} /bin/sh -c 'eval $(grep ^$(id -un): /etc/passwd | cut -d : -f 7-)'", commandObject)
|
||||
} else {
|
||||
command = utils.ApplyTemplate(fmt.Sprintf("docker exec -it {{ .Container.ID }} %s", shell), commandObject)
|
||||
}
|
||||
|
||||
// TODO: use SDK
|
||||
resolvedCommand := utils.ApplyTemplate("docker exec -it {{ .Container.ID }} /bin/sh -c 'eval $(grep ^$(id -un): /etc/passwd | cut -d : -f 7-)'", commandObject)
|
||||
// attach and return the subprocess error
|
||||
cmd := gui.OSCommand.ExecutableFromString(resolvedCommand)
|
||||
cmd := gui.OSCommand.ExecutableFromString(command)
|
||||
return gui.runSubprocess(cmd)
|
||||
}
|
||||
|
||||
|
@ -210,8 +210,8 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
|
||||
ViewName: "containers",
|
||||
Key: 's',
|
||||
Modifier: gocui.ModNone,
|
||||
Handler: gui.handleContainerStop,
|
||||
Description: gui.Tr.Stop,
|
||||
Handler: gui.handleContainerStartStop,
|
||||
Description: gui.Tr.StartStop,
|
||||
},
|
||||
{
|
||||
ViewName: "containers",
|
||||
|
@ -26,7 +26,7 @@ func (gui *Gui) runSubprocessWithMessage(cmd *exec.Cmd, msg string) error {
|
||||
|
||||
gui.PauseBackgroundThreads = true
|
||||
|
||||
gui.runCommand(cmd, msg)
|
||||
err := gui.runCommand(cmd, msg)
|
||||
|
||||
if err := gui.g.Resume(); err != nil {
|
||||
return gui.createErrorPanel(err.Error())
|
||||
@ -34,10 +34,26 @@ func (gui *Gui) runSubprocessWithMessage(cmd *exec.Cmd, msg string) error {
|
||||
|
||||
gui.PauseBackgroundThreads = false
|
||||
|
||||
return nil
|
||||
return err
|
||||
}
|
||||
|
||||
func (gui *Gui) runCommand(cmd *exec.Cmd, msg string) {
|
||||
func (gui *Gui) runCommandSilently(cmd *exec.Cmd) error {
|
||||
stop := make(chan os.Signal, 1)
|
||||
defer signal.Stop(stop)
|
||||
|
||||
go func() {
|
||||
signal.Notify(stop, os.Interrupt)
|
||||
<-stop
|
||||
|
||||
if err := gui.OSCommand.Kill(cmd); err != nil {
|
||||
gui.Log.Error(err)
|
||||
}
|
||||
}()
|
||||
|
||||
return cmd.Run()
|
||||
}
|
||||
|
||||
func (gui *Gui) runCommand(cmd *exec.Cmd, msg string) error {
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stdout
|
||||
cmd.Stdin = os.Stdin
|
||||
@ -58,9 +74,9 @@ func (gui *Gui) runCommand(cmd *exec.Cmd, msg string) {
|
||||
if msg != "" {
|
||||
fmt.Fprintf(os.Stdout, "\n%s\n\n", utils.ColoredString(msg, color.FgGreen))
|
||||
}
|
||||
if err := cmd.Run(); err != nil {
|
||||
// not handling the error explicitly because usually we're going to see it
|
||||
// in the output anyway
|
||||
err := cmd.Run()
|
||||
|
||||
if err != nil {
|
||||
gui.Log.Error(err)
|
||||
}
|
||||
|
||||
@ -69,4 +85,6 @@ func (gui *Gui) runCommand(cmd *exec.Cmd, msg string) {
|
||||
cmd.Stderr = io.Discard
|
||||
|
||||
gui.promptToReturn()
|
||||
|
||||
return err
|
||||
}
|
||||
|
@ -26,6 +26,7 @@ type TranslationSet struct {
|
||||
CannotAttachStoppedContainerError string
|
||||
CannotAccessDockerSocketError string
|
||||
CannotKillChildError string
|
||||
CannotStartStop string
|
||||
|
||||
Donate string
|
||||
Cancel string
|
||||
@ -59,6 +60,7 @@ type TranslationSet struct {
|
||||
Down string
|
||||
DownWithVolumes string
|
||||
Start string
|
||||
StartStop string
|
||||
Rebuild string
|
||||
Recreate string
|
||||
PreviousContext string
|
||||
@ -153,6 +155,7 @@ func englishSet() TranslationSet {
|
||||
CannotAttachStoppedContainerError: "You cannot attach to a stopped container, you need to start it first (which you can actually do with the 'r' key) (yes I'm too lazy to do this automatically for you) (pretty cool that I get to communicate one-on-one with you in the form of an error message though)",
|
||||
CannotAccessDockerSocketError: "Can't access docker socket at: unix:///var/run/docker.sock\nRun lazydocker as root or read https://docs.docker.com/install/linux/linux-postinstall/",
|
||||
CannotKillChildError: "Waited three seconds for child process to stop. There may be an orphan process that continues to run on your system.",
|
||||
CannotStartStop: "Cannot start stop this container",
|
||||
|
||||
Donate: "Donate",
|
||||
Confirm: "Confirm",
|
||||
@ -182,6 +185,7 @@ func englishSet() TranslationSet {
|
||||
Down: "down project",
|
||||
DownWithVolumes: "down project with volumes",
|
||||
Start: "start",
|
||||
StartStop: "start/stop",
|
||||
Rebuild: "rebuild",
|
||||
Recreate: "recreate",
|
||||
PreviousContext: "previous tab",
|
||||
|
Loading…
Reference in New Issue
Block a user