containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4333 from giuseppe/error-rootless-cni 

rootless: raise an error with --network=
This commit is contained in:
OpenShift Merge Robot 2019-10-24 21:29:53 +02:00 committed by GitHub
parent ba4a808fe7 8f75b3e8c9
commit 77c7a28a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/options.go
View File

@ -1014,6 +1014,13 @@ func WithNetNS(portMappings []ocicni.PortMapping, postConfigureNetNS bool, netmo
ctr.config.NetMode = namespaces.NetworkMode(netmode) ctr.config.NetMode = namespaces.NetworkMode(netmode)
ctr.config.CreateNetNS = true ctr.config.CreateNetNS = true
ctr.config.PortMappings = portMappings ctr.config.PortMappings = portMappings
if rootless.IsRootless() {
if len(networks) > 0 {
return errors.New("cannot use CNI networks with rootless containers")
}
}
ctr.config.Networks = networks ctr.config.Networks = networks
return nil return nil