diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-06 18:17:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 18:17:55 +0200 |
| commit | b5618d9e354a565fb8e472208c835a36373e4fbb (patch) | |
| tree | f755f4b52de94c38b432f23127d302b3d8c0a1a4 /libpod/oci_linux.go | |
| parent | 37b40e9acdae6bfa79d53928361540754417cdc6 (diff) | |
| parent | 97b84dedf3806a9e87c04ccfb51212992785d2c8 (diff) | |
| download | podman-b5618d9e354a565fb8e472208c835a36373e4fbb.tar.gz podman-b5618d9e354a565fb8e472208c835a36373e4fbb.tar.bz2 podman-b5618d9e354a565fb8e472208c835a36373e4fbb.zip | |
Merge pull request #3736 from baude/revert
Revert "rootless: Rearrange setup of rootless containers"
Diffstat (limited to 'libpod/oci_linux.go')
| -rw-r--r-- | libpod/oci_linux.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index 4d8e36516..45365203e 100644 --- a/libpod/oci_linux.go +++ b/libpod/oci_linux.go @@ -405,14 +405,6 @@ 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? |