diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-02-18 23:37:03 +0100 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2021-04-01 17:27:03 +0200 |
| commit | 0743ead71289cf6198a14fddf071972df9b6a332 (patch) | |
| tree | d22b3d34fb1870cae7eed036a3a913e12de1c79c /libpod | |
| parent | 00b2ec5e6f8ad332411271df1bdd968493cab2c2 (diff) | |
| download | podman-0743ead71289cf6198a14fddf071972df9b6a332.tar.gz podman-0743ead71289cf6198a14fddf071972df9b6a332.tar.bz2 podman-0743ead71289cf6198a14fddf071972df9b6a332.zip | |
Fix pod infra container cni network setup
For rootless users the infra container used the slirp4netns net mode
even when bridge was requested. We can support bridge networking for
rootless users so we have allow this. The default is not changed.
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_pod_infra_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go index 0a09e40ea..1ae375ed9 100644 --- a/libpod/runtime_pod_infra_linux.go +++ b/libpod/runtime_pod_infra_linux.go @@ -104,7 +104,7 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, rawIm default: // Since user namespace sharing is not implemented, we only need to check if it's rootless netmode := "bridge" - if isRootless || p.config.InfraContainer.Slirp4netns { + if p.config.InfraContainer.Slirp4netns { netmode = "slirp4netns" if len(p.config.InfraContainer.NetworkOptions) != 0 { options = append(options, WithNetworkOptions(p.config.InfraContainer.NetworkOptions)) |