vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/crio/main.go
View file

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