Allow podman start to attach to a running container

If a container is already running, and a user asks to start it -a (attach), we should
honor this and attach to the container.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #634
Approved by: baude
This commit is contained in:
baude
2018-04-17 15:56:46 -05:00
committed by Atomic Bot
parent 313e5e83e9
commit 95f272a0c5
2 changed files with 10 additions and 1 deletions

View File

@ -96,6 +96,14 @@ func startCmd(c *cli.Context) error {
inputStream = nil
}
ctrState, err := ctr.State()
if err != nil {
return errors.Wrapf(err, "unable to get container state")
}
if ctrState == libpod.ContainerStateRunning {
return attachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.String("detach-keys"), c.BoolT("sig-proxy"))
}
if err := startAttachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.String("detach-keys"), c.Bool("sig-proxy")); err != nil {
return errors.Wrapf(err, "unable to start container %s", ctr.ID())
}

View File

@ -11,7 +11,8 @@ podman start - Start one or more containers
## DESCRIPTION
Start one or more containers. You may use container IDs or names as input. The *attach* and *interactive*
options cannot be used to override the *--tty** and *--interactive* options from when the container
was created.
was created. If you attempt to start a running container with the *--attach* option, podman will simply
attach to the container.
## OPTIONS