opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-05 19:02:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Create new network namespaces when initializing containers

Browse Source 
Also fix a few lingering lint issues

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #109
Approved by: mheon
This commit is contained in:
Matthew Heon
2017-12-06 16:43:23 -05:00
committed by Atomic Bot
parent 0ff92f8e20
commit ff9c965335
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libpod/networking.go
View File

@ -20,19 +20,19 @@ func getPodNetwork(id, name, nsPath string, ports []ocicni.PortMapping) ocicni.P
// Create and configure a new network namespace for a container
func (r *Runtime) createNetNS(ctr *Container) (err error) {
ns, err := ns.NewNS()
ctrNS, err := ns.NewNS()
if err != nil {
return errors.Wrapf(err, "error creating network namespace for container %s", ctr.ID())
}
defer func() {
if err != nil {
if err2 := ns.Close(); err2 != nil {
if err2 := ctrNS.Close(); err2 != nil {
logrus.Errorf("Error closing partially created network namespace for container %s: %v", ctr.ID(), err2)
}
}
}()
podNetwork := getPodNetwork(ctr.ID(), ctr.Name(), ns.Path(), ctr.config.PortMappings)
podNetwork := getPodNetwork(ctr.ID(), ctr.Name(), ctrNS.Path(), ctr.config.PortMappings)
if err := r.netPlugin.SetUpPod(podNetwork); err != nil {
return errors.Wrapf(err, "error configuring network namespace for container %s", ctr.ID())
@ -40,7 +40,7 @@ func (r *Runtime) createNetNS(ctr *Container) (err error) {
// TODO hostport mappings for forwarded ports
ctr.state.NetNS = ns
ctr.state.NetNS = ctrNS
return nil
}