From a40aa7e9c8d5642e57add77ac3d9b92d174f9add Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 6 Sep 2018 08:29:32 -0500 Subject: Start pod infra container when pod is created When we create a pod that also has an infra container, we should start the infra container automatically. This allows users to add running containers to the pod immediately. Signed-off-by: baude Closes: #1415 Approved by: rhatdan --- libpod/runtime_pod_linux.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libpod') diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 17629defe..dd57007e0 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -109,6 +109,15 @@ func (r *Runtime) NewPod(ctx context.Context, options ...PodCreateOption) (*Pod, if err := pod.save(); err != nil { return nil, err } + + // Once the pod infra container has been created, we start it + if err := ctr.Start(ctx); err != nil { + // If the infra container does not start, we need to tear the pod down. + if err2 := r.removePod(ctx, pod, true, true); err2 != nil { + logrus.Errorf("Error removing pod after infra container failed to start: %v", err2) + } + return nil, errors.Wrapf(err, "error starting Infra Container") + } } return pod, nil -- cgit v1.2.3-54-g00ecf