github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ctr: error if tty && nullIO

Browse Source 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2017-10-24 05:23:55 +09:00
parent 04659d9405
commit e0da28acc4
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ctr/run_unix.go
View File

@ -12,6 +12,7 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd" "github.com/containerd/containerd"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@ -121,6 +122,9 @@ func newTask(ctx gocontext.Context, client *containerd.Client, container contain
io = containerd.StdioTerminal io = containerd.StdioTerminal
} }
if nullIO { if nullIO {
if tty {
return nil, errors.New("tty and null-io cannot be used together")
}
io = containerd.NullIO io = containerd.NullIO
} }
return container.NewTask(ctx, io) return container.NewTask(ctx, io)

3
cmd/ctr/run_windows.go
View File

@ -123,6 +123,9 @@ func newTask(ctx gocontext.Context, client *containerd.Client, container contain
io = containerd.StdioTerminal io = containerd.StdioTerminal
} }
if nullIO { if nullIO {
if tty {
return nil, errors.New("tty and null-io cannot be used together")
}
io = containerd.NullIO io = containerd.NullIO
} }
return container.NewTask(ctx, io) return container.NewTask(ctx, io)