Use netlink instead of shelling out to weave docker-bridge-ip
This commit is contained in:
1 parent
1d3c80ab49
commit
e2ec2b436d
3 files changed
+16
-7
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user