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 /cmd/podman/attach.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 'cmd/podman/attach.go')
| -rw-r--r-- | cmd/podman/attach.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/attach.go b/cmd/podman/attach.go index 7480bd6a2..b70ff649c 100644 --- a/cmd/podman/attach.go +++ b/cmd/podman/attach.go @@ -76,7 +76,8 @@ func attachCmd(c *cliconfig.AttachValues) error { inputStream = nil } - if err := startAttachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.DetachKeys, c.SigProxy, false); err != nil && errors.Cause(err) != libpod.ErrDetach { + // If the container is in a pod, also set to recursively start dependencies + if err := startAttachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.DetachKeys, c.SigProxy, false, ctr.PodID() != ""); err != nil && errors.Cause(err) != libpod.ErrDetach { return errors.Wrapf(err, "error attaching to container %s", ctr.ID()) } |