kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md

Browse source 
Fix incorrectly named "ip-mask" and "api-cors-headers" options
This commit is contained in:
Vincent Demeester 2016-05-24 18:21:52 +02:00
commit f0d6fd93a2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/config.go
View file

@ -88,7 +88,7 @@ type CommonConfig struct {
Root string `json:"graph,omitempty"` Root string `json:"graph,omitempty"`
SocketGroup string `json:"group,omitempty"` SocketGroup string `json:"group,omitempty"`
TrustKeyPath string `json:"-"` TrustKeyPath string `json:"-"`
CorsHeaders string `json:"api-cors-headers,omitempty"` CorsHeaders string `json:"api-cors-header,omitempty"`
EnableCors bool `json:"api-enable-cors,omitempty"` EnableCors bool `json:"api-enable-cors,omitempty"`
// ClusterStore is the storage backend used for the cluster information. It is used by both // ClusterStore is the storage backend used for the cluster information. It is used by both

2
daemon/config_unix.go
View file

@ -41,7 +41,7 @@ type bridgeConfig struct {
EnableIPv6 bool `json:"ipv6,omitempty"` EnableIPv6 bool `json:"ipv6,omitempty"`
EnableIPTables bool `json:"iptables,omitempty"` EnableIPTables bool `json:"iptables,omitempty"`
EnableIPForward bool `json:"ip-forward,omitempty"` EnableIPForward bool `json:"ip-forward,omitempty"`
EnableIPMasq bool `json:"ip-mask,omitempty"` EnableIPMasq bool `json:"ip-masq,omitempty"`
EnableUserlandProxy bool `json:"userland-proxy,omitempty"` EnableUserlandProxy bool `json:"userland-proxy,omitempty"`
DefaultIP net.IP `json:"ip,omitempty"` DefaultIP net.IP `json:"ip,omitempty"`
IP string `json:"bip,omitempty"` IP string `json:"bip,omitempty"`

4
docs/reference/commandline/dockerd.md
View file

@ -939,7 +939,7 @@ This is a full example of the allowed configuration options in the file:
"tlscacert": "", "tlscacert": "",
"tlscert": "", "tlscert": "",
"tlskey": "", "tlskey": "",
"api-cors-headers": "", "api-cors-header": "",
"selinux-enabled": false, "selinux-enabled": false,
"userns-remap": "", "userns-remap": "",
"group": "", "group": "",
@ -948,7 +948,7 @@ This is a full example of the allowed configuration options in the file:
"ipv6": false, "ipv6": false,
"iptables": false, "iptables": false,
"ip-forward": false, "ip-forward": false,
"ip-mask": false, "ip-masq": false,
"userland-proxy": false, "userland-proxy": false,
"ip": "0.0.0.0", "ip": "0.0.0.0",
"bridge": "", "bridge": "",