Merge pull request #126 from mattfarina/fix/dns

Fix DNS passing. New env var is PLUGIN_CUSTOM_DNS
This commit is contained in:
Brad Rydzewski 2017-05-30 23:19:21 +02:00 committed by GitHub
commit 7bcc544685

10
main.go
View File

@ -63,7 +63,7 @@ func main() {
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "daemon.dns", Name: "daemon.dns",
Usage: "docker daemon dns server", Usage: "docker daemon dns server",
EnvVar: "PLUGIN_DNS", EnvVar: "PLUGIN_CUSTOM_DNS",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "daemon.insecure", Name: "daemon.insecure",
@ -103,10 +103,10 @@ func main() {
EnvVar: "PLUGIN_CONTEXT", EnvVar: "PLUGIN_CONTEXT",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "tags", Name: "tags",
Usage: "build tags", Usage: "build tags",
Value: &cli.StringSlice{"latest"}, Value: &cli.StringSlice{"latest"},
EnvVar: "PLUGIN_TAG,PLUGIN_TAGS", EnvVar: "PLUGIN_TAG,PLUGIN_TAGS",
FilePath: ".tags", FilePath: ".tags",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{