From 8713483362904911c699d1cb3bdfcbd6694f30a2 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 11 Jul 2019 10:17:33 -0400 Subject: Fix a bug where ctrs could not be removed from pods Using pod removal worked, but container removal was missing the most critical step - the actual removal. Must have been accidentally removed during a refactor. Fixes #3556 Signed-off-by: Matthew Heon --- libpod/runtime_ctr.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 760a07daf..4b3aeaa37 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -431,10 +431,12 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, // If we're removing the pod, the container will be evicted // from the state elsewhere if !removePod { - if cleanupErr == nil { - cleanupErr = err - } else { - logrus.Errorf("removing container from pod: %v", err) + if err := r.state.RemoveContainerFromPod(pod, c); err != nil { + if cleanupErr == nil { + cleanupErr = err + } else { + logrus.Errorf("removing container from pod: %v", err) + } } } } else { -- cgit v1.2.3-54-g00ecf