diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-17 21:04:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-17 21:04:33 +0100 |
| commit | 6aaf8d39a9a26510e40fd54399e97fe177afadde (patch) | |
| tree | 3754ecbf29b1d8e63675894f25abde206b8308c3 /libpod/runtime_pod_linux.go | |
| parent | a99f4924d9d76f59e85bde09944d7c5e687ea8aa (diff) | |
| parent | 81804fc4641d279fec8f9bf48b21b22fc90cb891 (diff) | |
| download | podman-6aaf8d39a9a26510e40fd54399e97fe177afadde.tar.gz podman-6aaf8d39a9a26510e40fd54399e97fe177afadde.tar.bz2 podman-6aaf8d39a9a26510e40fd54399e97fe177afadde.zip | |
Merge pull request #2295 from haircommander/recursive-start
Recursively start a pod if a container is run in it
Diffstat (limited to 'libpod/runtime_pod_linux.go')
| -rw-r--r-- | libpod/runtime_pod_linux.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index c6d497c0c..c378d18e4 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -117,15 +117,6 @@ 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 |