summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-01-20 13:25:37 +0100
committerGitHub <noreply@github.com>2019-01-20 13:25:37 +0100
commit74b85098cf7f6e2809f9075475f4fae44c0f011c (patch)
tree481b47153f0ca6a56af066393e221bd58349d8b3 /pkg
parent579fc0f7eb3928a076b0a5d1d6ec444205a0a930 (diff)
parentf182946bef84d2766c4ff9faef171cf69afacb97 (diff)
downloadpodman-74b85098cf7f6e2809f9075475f4fae44c0f011c.tar.gz
podman-74b85098cf7f6e2809f9075475f4fae44c0f011c.tar.bz2
podman-74b85098cf7f6e2809f9075475f4fae44c0f011c.zip
Merge pull request #2142 from giuseppe/expose-ports
rootless: support port redirection from the host
Diffstat (limited to 'pkg')
-rw-r--r--pkg/spec/createconfig.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go
index 632d60b55..344f4afb9 100644
--- a/pkg/spec/createconfig.go
+++ b/pkg/spec/createconfig.go
@@ -422,11 +422,7 @@ func (c *CreateConfig) GetContainerCreateOptions(runtime *libpod.Runtime, pod *l
}
options = append(options, libpod.WithNetNSFrom(connectedCtr))
} else if !c.NetMode.IsHost() && !c.NetMode.IsNone() {
- isRootless := rootless.IsRootless()
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, string(c.NetMode), networks))
}