- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
- Reworked daemon to allocate network resources using libnetwork.
- Reworked remove link code to also update network resources in libnetwork.
- Adjusted the exec driver command population to reflect libnetwork design.
- Adjusted the exec driver create command steps.
- Updated a few test cases to reflect the change in design.
- Removed the dns setup code from docker as resolv.conf is entirely managed
in libnetwork.
- Integrated with lxc exec driver.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
30 lines
733 B
Go
30 lines
733 B
Go
package network
|
|
|
|
import "github.com/docker/docker/nat"
|
|
|
|
type Address struct {
|
|
Addr string
|
|
PrefixLen int
|
|
}
|
|
|
|
type Settings struct {
|
|
Bridge string
|
|
EndpointID string
|
|
Gateway string
|
|
GlobalIPv6Address string
|
|
GlobalIPv6PrefixLen int
|
|
HairpinMode bool
|
|
IPAddress string
|
|
IPPrefixLen int
|
|
IPv6Gateway string
|
|
LinkLocalIPv6Address string
|
|
LinkLocalIPv6PrefixLen int
|
|
MacAddress string
|
|
NetworkID string
|
|
PortMapping map[string]map[string]string // Deprecated
|
|
Ports nat.PortMap
|
|
SandboxKey string
|
|
SecondaryIPAddresses []Address
|
|
SecondaryIPv6Addresses []Address
|
|
}
|