diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-23 05:17:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-23 05:17:21 -0700 |
commit | fca5ad095e282d35db203cdbb2655040c606394d (patch) | |
tree | e6843ecccc303f826c0b103056b5de84b9e8482a | |
parent | 58a26ac9dcb0d75ca7f061941c1399a28579ed69 (diff) | |
parent | fc89065a800206567c8fe74841db300dff7abfad (diff) | |
download | podman-fca5ad095e282d35db203cdbb2655040c606394d.tar.gz podman-fca5ad095e282d35db203cdbb2655040c606394d.tar.bz2 podman-fca5ad095e282d35db203cdbb2655040c606394d.zip |
Merge pull request #1681 from giuseppe/cleanup-runtime-status
oci: cleanup process status
-rw-r--r-- | libpod/oci.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 6eaaa7a29..2257cd42f 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -378,6 +378,7 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res childPipe.Close() return err } + defer cmd.Wait() // We don't need childPipe on the parent side childPipe.Close() @@ -478,6 +479,7 @@ func (r *OCIRuntime) updateContainerStatus(ctr *Container) error { } return errors.Wrapf(err, "error getting container %s state. stderr/out: %s", ctr.ID(), out) } + defer cmd.Wait() errPipe.Close() out, err := ioutil.ReadAll(outPipe) |