Use netlink instead of shelling out to weave docker-bridge-ip

This commit is contained in:
Adam Harrison committed 2016-02-04 14:00:01 +00:00
1 parent 1d3c80ab49
commit e2ec2b436d
3 files changed
+16 -7

No files matched your search

+9 -3
View File
@@ -12,9 +12,10 @@ import (
)
var (
version = "(unreleased version)"
defaultDockerHost = "unix:///var/run/docker.sock"
defaultProcPath = "/proc"
version = "(unreleased version)"
defaultDockerHost = "unix:///var/run/docker.sock"
defaultProcPath = "/proc"
defaultDockerBridge = "docker0"
)
func main() {
@@ -64,6 +65,11 @@ func main() {
Log.Warning("--with-dns option has been removed; DNS is on by default")
}
c.DockerBridge = defaultDockerBridge
if dockerBridge := os.Getenv("DOCKER_BRIDGE"); dockerBridge != "" {
c.DockerBridge = dockerBridge
}
c.DockerHost = defaultDockerHost
if dockerHost := os.Getenv("DOCKER_HOST"); dockerHost != "" {
c.DockerHost = dockerHost