diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index 0ebc1796..e048d268 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -525,7 +525,7 @@ func NewAppConfig(name, version, commit, date string, buildSource string, debugg } func configDirForVendor(vendor string, projectName string) string { - envConfigDir := os.Getenv("CONFIG_DIR") + envConfigDir := os.Getenv("LAZYDOCKER_CONFIG_DIR") if envConfigDir != "" { return envConfigDir } diff --git a/pkg/config/app_config_test.go b/pkg/config/app_config_test.go index cd8167e4..be15b1dd 100644 --- a/pkg/config/app_config_test.go +++ b/pkg/config/app_config_test.go @@ -49,6 +49,19 @@ func TestDockerComposeCommandMultipleFiles(t *testing.T) { } } +func TestConfigDirUsesLazydockerConfigDir(t *testing.T) { + expected := t.TempDir() + legacy := t.TempDir() + + t.Setenv("LAZYDOCKER_CONFIG_DIR", expected) + t.Setenv("CONFIG_DIR", legacy) + + actual := configDir("lazydocker") + if actual != expected { + t.Fatalf("Expected %s but got %s", expected, actual) + } +} + func TestWritingToConfigFile(t *testing.T) { // init the AppConfig emptyComposeFiles := []string{}