diff options
| author | baude <bbaude@redhat.com> | 2017-11-27 12:40:45 -0600 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-11-29 22:01:47 +0000 |
| commit | 742475885eee9a21232f24aa7528eb5e0022a42f (patch) | |
| tree | 3ef9d02657b09e5bcd44f4ad6c7224ebae62acba /libpod/container_attach.go | |
| parent | ad255533d415393ebd119645af5c8b5a6637255f (diff) | |
| download | podman-742475885eee9a21232f24aa7528eb5e0022a42f.tar.gz podman-742475885eee9a21232f24aa7528eb5e0022a42f.tar.bz2 podman-742475885eee9a21232f24aa7528eb5e0022a42f.zip | |
kpod_start
Starts one or more containers.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #83
Approved by: rhatdan
Diffstat (limited to 'libpod/container_attach.go')
| -rw-r--r-- | libpod/container_attach.go | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libpod/container_attach.go b/libpod/container_attach.go index 7775e1a5d..bcfb6ec49 100644 --- a/libpod/container_attach.go +++ b/libpod/container_attach.go @@ -7,7 +7,7 @@ import ( "net" "os" "path/filepath" - "strconv" + //"strconv" "github.com/docker/docker/pkg/term" "github.com/pkg/errors" @@ -31,13 +31,17 @@ func (c *Container) attachContainerSocket(resize <-chan remotecommand.TerminalSi outputStream := os.Stdout errorStream := os.Stderr defer inputStream.Close() - tty, err := strconv.ParseBool(c.runningSpec.Annotations["io.kubernetes.cri-o.TTY"]) - if err != nil { - return errors.Wrapf(err, "unable to parse annotations in %s", c.ID) - } - if !tty { - return errors.Errorf("no tty available for %s", c.ID()) - } + + // TODO Renable this when tty/terminal discussion is had. + /* + tty, err := strconv.ParseBool(c.runningSpec.Annotations["io.kubernetes.cri-o.TTY"]) + if err != nil { + return errors.Wrapf(err, "unable to parse annotations in %s", c.ID) + } + if !tty { + return errors.Errorf("no tty available for %s", c.ID()) + } + */ if terminal.IsTerminal(int(inputStream.Fd())) { oldTermState, err := term.SaveState(inputStream.Fd()) |