diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-07 11:00:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 11:00:28 -0400 |
| commit | 96f9d0dc0e0dbb796494af573c67e194e60aebcd (patch) | |
| tree | c08d233eb47c07482860d494114ba10e987953fc | |
| parent | 7a09429dff774f8ac6ebac62c0d7061846ef4b71 (diff) | |
| parent | 811cce5a8a6fa1d95015ba0c3f6d4f68725fd753 (diff) | |
| download | podman-96f9d0dc0e0dbb796494af573c67e194e60aebcd.tar.gz podman-96f9d0dc0e0dbb796494af573c67e194e60aebcd.tar.bz2 podman-96f9d0dc0e0dbb796494af573c67e194e60aebcd.zip | |
Merge pull request #14507 from Luap99/userns-net
libpod: store network status when userns is used
| -rw-r--r-- | libpod/container_internal.go | 3 | ||||
| -rw-r--r-- | test/system/500-networking.bats | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 7494eb3ec..5db65ca3f 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1000,6 +1000,9 @@ func (c *Container) completeNetworkSetup() error { if err := c.runtime.setupNetNS(c); err != nil { return err } + if err := c.save(); err != nil { + return err + } state := c.state // collect any dns servers that cni tells us to use (dnsname) for _, status := range c.getNetworkStatus() { diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats index 3db0804d1..92aabae32 100644 --- a/test/system/500-networking.bats +++ b/test/system/500-networking.bats @@ -111,6 +111,10 @@ load helpers $IMAGE nc -l -n -v -p $myport cid="$output" + # check that podman stores the network info correctly when a userns is used (#14465) + run_podman container inspect --format "{{.NetworkSettings.SandboxKey}}" $cid + assert "$output" =~ ".*/netns/netns-.*" "Netns path should be set" + wait_for_output "listening on .*:$myport .*" $cid # emit random string, and check it |