diff options
| author | unclejack <unclejack@users.noreply.github.com> | 2014-03-26 00:00:37 +0200 |
|---|---|---|
| committer | unclejack <unclejack@users.noreply.github.com> | 2014-03-26 00:00:37 +0200 |
| commit | 867b2a90c228f62cdcd44907ceef279a2d8f1ac5 (patch) | |
| tree | a41c506d3adefe00861f9e38155f5b21e1692ab4 /execdriver/native/default_template.go | |
| parent | 143c9707a9fafc39e1d9747f528db97b2564f01e (diff) | |
| parent | 3600720a36929b1a51a227699a337cc593e2534d (diff) | |
| download | docker-release-0.9.tar.gz | |
Merge pull request #4831 from unclejack/final_bump_v0.9.1v0.9.1release-0.9hotfix-0.9.2
Bump to version 0.9.1
Diffstat (limited to 'execdriver/native/default_template.go')
| -rw-r--r-- | execdriver/native/default_template.go | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/execdriver/native/default_template.go b/execdriver/native/default_template.go index 6e7d597b7b..62d804016a 100644 --- a/execdriver/native/default_template.go +++ b/execdriver/native/default_template.go @@ -19,19 +19,30 @@ func createContainer(c *execdriver.Command) *libcontainer.Container { container.WorkingDir = c.WorkingDir container.Env = c.Env - if c.Network != nil { - container.Networks = []*libcontainer.Network{ - { - Mtu: c.Network.Mtu, - Address: fmt.Sprintf("%s/%d", c.Network.IPAddress, c.Network.IPPrefixLen), - Gateway: c.Network.Gateway, - Type: "veth", - Context: libcontainer.Context{ - "prefix": "veth", - "bridge": c.Network.Bridge, - }, + loopbackNetwork := libcontainer.Network{ + Mtu: c.Network.Mtu, + Address: fmt.Sprintf("%s/%d", "127.0.0.1", 0), + Gateway: "localhost", + Type: "loopback", + Context: libcontainer.Context{}, + } + + container.Networks = []*libcontainer.Network{ + &loopbackNetwork, + } + + if c.Network.Interface != nil { + vethNetwork := libcontainer.Network{ + Mtu: c.Network.Mtu, + Address: fmt.Sprintf("%s/%d", c.Network.Interface.IPAddress, c.Network.Interface.IPPrefixLen), + Gateway: c.Network.Interface.Gateway, + Type: "veth", + Context: libcontainer.Context{ + "prefix": "veth", + "bridge": c.Network.Interface.Bridge, }, } + container.Networks = append(container.Networks, &vethNetwork) } container.Cgroups.Name = c.ID |