From b4509fb45ee8cc212bbcd026e67333763fcc33e8 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 11 May 2022 19:41:53 +1000 Subject: [PATCH] add TODO's for using the docker SDK --- pkg/commands/container.go | 1 + pkg/config/app_config.go | 3 ++- pkg/gui/containers_panel.go | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/commands/container.go b/pkg/commands/container.go index 61201318..c7d425a2 100644 --- a/pkg/commands/container.go +++ b/pkg/commands/container.go @@ -197,6 +197,7 @@ func (c *Container) Attach() (*exec.Cmd, error) { } c.Log.Warn(fmt.Sprintf("attaching to container %s", c.Name)) + // TODO: use SDK cmd := c.OSCommand.PrepareSubProcess("docker", "attach", "--sig-proxy=false", c.ID) return cmd, nil } diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index a537157d..b9aef7ce 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -336,7 +336,8 @@ func GetDefaultConfig() UserConfig { DockerComposeConfig: "{{ .DockerCompose }} config", CheckDockerComposeConfig: "{{ .DockerCompose }} config --quiet", ServiceTop: "{{ .DockerCompose }} top {{ .Service.Name }}", - ViewContainerLogs: "docker logs --timestamps --follow --since=60m {{ .Container.ID }}", + // TODO: use SDK + ViewContainerLogs: "docker logs --timestamps --follow --since=60m {{ .Container.ID }}", }, CustomCommands: CustomCommands{ Containers: []CustomCommand{}, diff --git a/pkg/gui/containers_panel.go b/pkg/gui/containers_panel.go index 3df23c75..97caae31 100644 --- a/pkg/gui/containers_panel.go +++ b/pkg/gui/containers_panel.go @@ -569,6 +569,8 @@ func (gui *Gui) handleContainersExecShell(g *gocui.Gui, v *gocui.View) error { commandObject := gui.DockerCommand.NewCommandObject(commands.CommandObject{ Container: container, }) + + // 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)