diff options
author | Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | 2020-08-26 18:07:51 +0900 |
---|---|---|
committer | Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> | 2020-09-09 15:47:38 +0900 |
commit | f82abc774a70419bc7a2ff444a323110e1d9d938 (patch) | |
tree | a4dc3b5d7be2eb9473db3d089e9238ce2a3ef1d8 /libpod/container_internal.go | |
parent | d34868a1366d49b56e8127973147c076c99a8a80 (diff) | |
download | podman-f82abc774a70419bc7a2ff444a323110e1d9d938.tar.gz podman-f82abc774a70419bc7a2ff444a323110e1d9d938.tar.bz2 podman-f82abc774a70419bc7a2ff444a323110e1d9d938.zip |
rootless: support `podman network create` (CNI-in-slirp4netns)
Usage:
```
$ podman network create foo
$ podman run -d --name web --hostname web --network foo nginx:alpine
$ podman run --rm --network foo alpine wget -O - http://web.dns.podman
Connecting to web.dns.podman (10.88.4.6:80)
...
<h1>Welcome to nginx!</h1>
...
```
See contrib/rootless-cni-infra for the design.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Diffstat (limited to 'libpod/container_internal.go')
-rw-r--r-- | libpod/container_internal.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index c41d81a2b..c3f07a48b 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -957,8 +957,10 @@ func (c *Container) completeNetworkSetup() error { if err := c.syncContainer(); err != nil { return err } - if c.config.NetMode.IsSlirp4netns() { + if rootless.IsRootless() { return c.runtime.setupRootlessNetNS(c) + } else if c.config.NetMode.IsSlirp4netns() { + return c.runtime.setupSlirp4netns(c) } if err := c.runtime.setupNetNS(c); err != nil { return err |