diff options
| author | baude <bbaude@redhat.com> | 2018-04-17 15:56:46 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-18 14:44:51 +0000 |
| commit | 95f272a0c55d2e33de1f69ce3c7f029c2c3c2c0d (patch) | |
| tree | 2fa9b9c7333621cb4f3ebd20b5056522990aea29 | |
| parent | 313e5e83e92f68349d2026fc3f358f237fe93a4a (diff) | |
| download | podman-95f272a0c55d2e33de1f69ce3c7f029c2c3c2c0d.tar.gz podman-95f272a0c55d2e33de1f69ce3c7f029c2c3c2c0d.tar.bz2 podman-95f272a0c55d2e33de1f69ce3c7f029c2c3c2c0d.zip | |
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
| -rw-r--r-- | cmd/podman/start.go | 8 | ||||
| -rw-r--r-- | docs/podman-start.1.md | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/cmd/podman/start.go b/cmd/podman/start.go index 00d153904..8f6fc5800 100644 --- a/cmd/podman/start.go +++ b/cmd/podman/start.go @@ -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()) } diff --git a/docs/podman-start.1.md b/docs/podman-start.1.md index 24fc49a8e..29f335781 100644 --- a/docs/podman-start.1.md +++ b/docs/podman-start.1.md @@ -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 |