Merge pull request #19517 from calavera/validate_config_keys

Verify that the configuration keys in the file are valid.
Upstream-commit: 34a83f9f2c0516b3c5e7024393487eee54309401
Component: engine
This commit is contained in:
Phil Estes
2016-01-22 15:01:29 -05:00
8 changed files with 170 additions and 45 deletions

View File

@ -838,10 +838,8 @@ This is a full example of the allowed configuration options in the file:
"storage-driver": "",
"storage-opts": "",
"labels": [],
"log-config": {
"log-driver": "",
"log-opts": []
},
"log-driver": "",
"log-opts": [],
"mtu": 0,
"pidfile": "",
"graph": "",
@ -852,12 +850,10 @@ This is a full example of the allowed configuration options in the file:
"hosts": [],
"log-level": "",
"tls": true,
"tls-verify": true,
"tls-opts": {
"tlscacert": "",
"tlscert": "",
"tlskey": ""
},
"tlsverify": true,
"tlscacert": "",
"tlscert": "",
"tlskey": "",
"api-cors-headers": "",
"selinux-enabled": false,
"userns-remap": "",