Merge pull request #630 from runcom/fix-insecure-reg-flag

cmd/crio: fix reading insecure-registry flags
This commit is contained in:
Mrunal Patel 2017-06-24 08:23:25 -07:00 committed by GitHub
commit 328e50fb50

View file

@ -63,7 +63,7 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
config.StorageOptions = ctx.GlobalStringSlice("storage-opt")
}
if ctx.GlobalIsSet("insecure-registry") {
config.InsecureRegistries = ctx.GlobalStringSlice("insecure-registries")
config.InsecureRegistries = ctx.GlobalStringSlice("insecure-registry")
}
if ctx.GlobalIsSet("default-transport") {
config.DefaultTransport = ctx.GlobalString("default-transport")