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 /libpod/oci_linux.go | |
| 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 'libpod/oci_linux.go')
| -rw-r--r-- | libpod/oci_linux.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index 45365203e..4d8e36516 100644 --- a/libpod/oci_linux.go +++ b/libpod/oci_linux.go @@ -405,6 +405,14 @@ func (r *OCIRuntime) stopContainer(ctr *Container, timeout uint) error { stopSignal = uint(syscall.SIGTERM) } + defer func() { + // cleanup container networking + err = ctr.cleanupNetwork() + if err != nil { + logrus.Errorf("Error cleaning up container: %s network: %v", ctr.ID(), err) + } + }() + if timeout > 0 { if err := r.killContainer(ctr, stopSignal); err != nil { // Is the container gone? |