tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow setting config dir with env var 

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
This commit is contained in:
Christopher Crone 2020-05-19 14:05:51 +02:00
parent d218c0745e
commit b7fb7e2e84
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli/config/flags.go
View File

@ -51,10 +51,14 @@ type ConfigFlags struct {
// AddConfigFlags adds persistent (global) flags // AddConfigFlags adds persistent (global) flags
func (c *ConfigFlags) AddConfigFlags(flags *pflag.FlagSet) { func (c *ConfigFlags) AddConfigFlags(flags *pflag.FlagSet) {
flags.StringVar(&c.Config, ConfigFlagName, filepath.Join(home(), ConfigFileDir), "Location of the client config files `DIRECTORY`") flags.StringVar(&c.Config, ConfigFlagName, confDir(), "Location of the client config files `DIRECTORY`")
} }
func home() string { func confDir() string {
env := os.Getenv("DOCKER_CONFIG")
if env != "" {
return env
}
home, _ := os.UserHomeDir() home, _ := os.UserHomeDir()
return home return filepath.Join(home, ConfigFileDir)
} }