diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-05 14:26:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 14:26:04 +0200 |
| commit | e2f38cdaa41ddc711cce40e00dab9c8457d2e830 (patch) | |
| tree | 2658cb33c3be5554f8a8da5c3de0b658c41dbc10 /pkg/spec | |
| parent | b609de2e3dc60df4179d41a54e359a8722dbd3ff (diff) | |
| parent | 80dcd4bebcdc8e280f6b43228561d09c194c328b (diff) | |
| download | podman-e2f38cdaa41ddc711cce40e00dab9c8457d2e830.tar.gz podman-e2f38cdaa41ddc711cce40e00dab9c8457d2e830.tar.bz2 podman-e2f38cdaa41ddc711cce40e00dab9c8457d2e830.zip | |
Merge pull request #3310 from gabibeyer/rootlessKata
rootless: Rearrange setup of rootless containers ***CIRRUS: TEST IMAGES***
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/createconfig.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index f21ae2831..289634a0d 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -270,7 +270,7 @@ func (c *CreateConfig) getContainerCreateOptions(runtime *libpod.Runtime, pod *l options = append(options, libpod.WithNetNSFrom(connectedCtr)) } else if !c.NetMode.IsHost() && !c.NetMode.IsNone() { hasUserns := c.UsernsMode.IsContainer() || c.UsernsMode.IsNS() || len(c.IDMappings.UIDMap) > 0 || len(c.IDMappings.GIDMap) > 0 - postConfigureNetNS := c.NetMode.IsSlirp4netns() || (hasUserns && !c.UsernsMode.IsHost()) + postConfigureNetNS := hasUserns && !c.UsernsMode.IsHost() options = append(options, libpod.WithNetNS(portBindings, postConfigureNetNS, string(c.NetMode), networks)) } |