1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make TLSOptions and LogConfig embedded structs.

Browse Source 
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
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/reference/commandline/daemon.md
View File

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