diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-11-26 21:31:06 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-11-28 09:21:59 +0100 |
| commit | 95f22a2ca055d6dec0281cee109375dc4fd9b78b (patch) | |
| tree | fb916a4b5e4960cada05db5c57f2aae5175009f2 /pkg/spec | |
| parent | 4203df69aca13f14e43ad32a9b7ffb6cfb8c1016 (diff) | |
| download | podman-95f22a2ca055d6dec0281cee109375dc4fd9b78b.tar.gz podman-95f22a2ca055d6dec0281cee109375dc4fd9b78b.tar.bz2 podman-95f22a2ca055d6dec0281cee109375dc4fd9b78b.zip | |
network: allow slirp4netns mode also for root containers
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/createconfig.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index 6a0642ee7..a0fd40318 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -391,11 +391,11 @@ func (c *CreateConfig) GetContainerCreateOptions(runtime *libpod.Runtime) ([]lib options = append(options, libpod.WithNetNSFrom(connectedCtr)) } else if !c.NetMode.IsHost() && !c.NetMode.IsNone() { isRootless := rootless.IsRootless() - postConfigureNetNS := isRootless || (len(c.IDMappings.UIDMap) > 0 || len(c.IDMappings.GIDMap) > 0) && !c.UsernsMode.IsHost() + postConfigureNetNS := c.NetMode.IsSlirp4netns() || (len(c.IDMappings.UIDMap) > 0 || len(c.IDMappings.GIDMap) > 0) && !c.UsernsMode.IsHost() if isRootless && len(portBindings) > 0 { return nil, errors.New("port bindings are not yet supported by rootless containers") } - options = append(options, libpod.WithNetNS(portBindings, postConfigureNetNS, networks)) + options = append(options, libpod.WithNetNS(portBindings, postConfigureNetNS, string(c.NetMode), networks)) } if c.PidMode.IsContainer() { |