From a5df084847ff85035d5bb489310ef756231792f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=89AU?= <clement.peau@displayce.com>
Date: Sun, 16 Jun 2024 00:16:39 +0200
Subject: [PATCH] add new config option to add handle preferred shells to
 execute on the container

---
 pkg/config/app_config.go    |  4 ++++
 pkg/gui/containers_panel.go | 27 ++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index d35a244d..c87bad62 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -216,6 +216,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
@@ -398,6 +401,7 @@ func GetDefaultConfig() UserConfig {
 			DockerComposeConfig:      "{{ .DockerCompose }} config",
 			CheckDockerComposeConfig: "{{ .DockerCompose }} config --quiet",
 			ServiceTop:               "{{ .DockerCompose }} top {{ .Service.Name }}",
+			PreferredExecShells:      []string{},
 		},
 		CustomCommands: CustomCommands{
 			Containers: []CustomCommand{},
diff --git a/pkg/gui/containers_panel.go b/pkg/gui/containers_panel.go
index 541c6990..c936630c 100644
--- a/pkg/gui/containers_panel.go
+++ b/pkg/gui/containers_panel.go
@@ -461,11 +461,32 @@ func (gui *Gui) containerExecShell(container *commands.Container) error {
 	commandObject := gui.DockerCommand.NewCommandObject(commands.CommandObject{
 		Container: container,
 	})
+	var command string
+	shell := ""
 
-	// 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)
+	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)
+	}
+
+	cmd := gui.OSCommand.ExecutableFromString(command)
 	// attach and return the subprocess error
-	cmd := gui.OSCommand.ExecutableFromString(resolvedCommand)
 	return gui.runSubprocess(cmd)
 }