kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Fix outdated docs and comments 

Signed-off-by: Chun Chen <ramichen@tencent.com>
This commit is contained in:
Chun Chen 2015-09-22 23:27:11 +08:00
parent 02fd54ea61
commit e82989f845
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnetwork/README.md
View File

@ -45,13 +45,13 @@ There are many networking solutions available to suit a broad range of use-cases
return return
} }
// Create the sandbox for the containr. // Create the sandbox for the container.
// NewSandbox accepts Variadic optional arguments which libnetwork can use.
sbx, err := controller.NewSandbox("container1", sbx, err := controller.NewSandbox("container1",
libnetwork.OptionHostname("test"), libnetwork.OptionHostname("test"),
libnetwork.OptionDomainname("docker.io")) libnetwork.OptionDomainname("docker.io"))
// A sandbox can join the endpoint via the join api. // A sandbox can join the endpoint via the join api.
// Join accepts Variadic arguments which libnetwork and Drivers can use.
err = ep.Join(sbx) err = ep.Join(sbx)
if err != nil { if err != nil {
return return

20
libnetwork/controller.go
View File

@ -2,16 +2,13 @@
Package libnetwork provides the basic functionality and extension points to Package libnetwork provides the basic functionality and extension points to
create network namespaces and allocate interfaces for containers to use. create network namespaces and allocate interfaces for containers to use.
// Create a new controller instance
controller, _err := libnetwork.New(nil)
// Select and configure the network driver
networkType := "bridge" networkType := "bridge"
// Create a new controller instance
driverOptions := options.Generic{} driverOptions := options.Generic{}
genericOption := make(map[string]interface{}) genericOption := make(map[string]interface{})
genericOption[netlabel.GenericData] = driverOptions genericOption[netlabel.GenericData] = driverOptions
err := controller.ConfigureNetworkDriver(networkType, genericOption) controller, err := libnetwork.New(config.OptionDriverConfig(networkType, genericOption))
if err != nil { if err != nil {
return return
} }
@ -32,11 +29,14 @@ create network namespaces and allocate interfaces for containers to use.
return return
} }
// A container can join the endpoint by providing the container ID to the join api. // Create the sandbox for the container.
// Join accepts Variadic arguments which will be made use of by libnetwork and Drivers // NewSandbox accepts Variadic optional arguments which libnetwork can use.
err = ep.Join("container1", sbx, err := controller.NewSandbox("container1",
libnetwork.JoinOptionHostname("test"), libnetwork.OptionHostname("test"),
libnetwork.JoinOptionDomainname("docker.io")) libnetwork.OptionDomainname("docker.io"))
// A sandbox can join the endpoint via the join api.
err = ep.Join(sbx)
if err != nil { if err != nil {
return return
} }