Merge pull request #118 from greysond/env-precedence

Change env precedence
This commit is contained in:
Brad Rydzewski 2017-03-24 22:32:29 +08:00 committed by GitHub
commit 4622c13eb6

View File

@ -137,22 +137,22 @@ func main() {
Name: "docker.registry", Name: "docker.registry",
Usage: "docker registry", Usage: "docker registry",
Value: defaultRegistry, Value: defaultRegistry,
EnvVar: "DOCKER_REGISTRY,PLUGIN_REGISTRY", EnvVar: "PLUGIN_REGISTRY,DOCKER_REGISTRY",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "docker.username", Name: "docker.username",
Usage: "docker username", Usage: "docker username",
EnvVar: "DOCKER_USERNAME,PLUGIN_USERNAME", EnvVar: "PLUGIN_USERNAME,DOCKER_USERNAME",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "docker.password", Name: "docker.password",
Usage: "docker password", Usage: "docker password",
EnvVar: "DOCKER_PASSWORD,PLUGIN_PASSWORD", EnvVar: "PLUGIN_PASSWORD,DOCKER_PASSWORD",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "docker.email", Name: "docker.email",
Usage: "docker email", Usage: "docker email",
EnvVar: "DOCKER_EMAIL,PLUGIN_EMAIL", EnvVar: "PLUGIN_EMAIL,DOCKER_EMAIL",
}, },
} }