From e94ff63bc55ba1368b4c88feb4a8a062151e9500 Mon Sep 17 00:00:00 2001 From: Humble Penguin Date: Sun, 5 Mar 2023 06:47:21 +0500 Subject: issue #2473 --- pkg/config/config_linux.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkg/config/config_linux.go b/pkg/config/config_linux.go index 8fdc0c473..a61ab1171 100644 --- a/pkg/config/config_linux.go +++ b/pkg/config/config_linux.go @@ -2,6 +2,7 @@ package config import ( "io/ioutil" + "os" "strings" ) @@ -10,9 +11,24 @@ func isWSL() bool { return err == nil && strings.Contains(string(data), "microsoft") } +func isContainer() bool { + data, err := ioutil.ReadFile("/proc/1/cgroup") + + if + strings.Contains(string(data), "docker") || + strings.Contains(string(data), "/lxc/") || + []string{string(data)}[0] != "systemd" && + []string{string(data)}[0] != "init" || + os.Getenv("container") != "" { + return err == nil && true + } + + return err == nil && false +} + // GetPlatformDefaultConfig gets the defaults for the platform func GetPlatformDefaultConfig() OSConfig { - if isWSL() { + if isWSL() && !isContainer() { return OSConfig{ EditCommand: ``, EditCommandTemplate: "", -- cgit v1.2.3 From dfe5c805c42b79697fd4c86b5dfbefa98a36de47 Mon Sep 17 00:00:00 2001 From: Humble Penguin Date: Sun, 5 Mar 2023 07:06:34 +0500 Subject: generated cheatsheets and ran code formatting --- pkg/config/config_linux.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/config/config_linux.go b/pkg/config/config_linux.go index a61ab1171..06c277061 100644 --- a/pkg/config/config_linux.go +++ b/pkg/config/config_linux.go @@ -14,12 +14,11 @@ func isWSL() bool { func isContainer() bool { data, err := ioutil.ReadFile("/proc/1/cgroup") - if - strings.Contains(string(data), "docker") || - strings.Contains(string(data), "/lxc/") || - []string{string(data)}[0] != "systemd" && - []string{string(data)}[0] != "init" || - os.Getenv("container") != "" { + if strings.Contains(string(data), "docker") || + strings.Contains(string(data), "/lxc/") || + []string{string(data)}[0] != "systemd" && + []string{string(data)}[0] != "init" || + os.Getenv("container") != "" { return err == nil && true } -- cgit v1.2.3