Make TLSOptions and LogConfig embedded structs.

That way the configuration file becomes flag, without extra keys.

Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
David Calavera 2016-01-22 13:14:48 -05:00 committed by Tibor Vass
parent 9930f31f74
commit 2ac86ababf

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": "",
@ -853,11 +851,9 @@ This is a full example of the allowed configuration options in the file:
"log-level": "",
"tls": true,
"tlsverify": true,
"tls-opts": {
"tlscacert": "",
"tlscert": "",
"tlskey": ""
},
"tlscacert": "",
"tlscert": "",
"tlskey": "",
"api-cors-headers": "",
"selinux-enabled": false,
"userns-remap": "",