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

Merge pull request #1676 from AkihiroSuda/null-io-fix

Browse Source 
ctr: error if tty && nullIO
This commit is contained in:
Michael Crosby 2017-10-30 10:10:22 -04:00 committed by GitHub
commit b93bd0cfec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -13,6 +13,7 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/cmd/ctr/commands"
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"
) )
@ -122,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)

3
cmd/ctr/run_windows.go
View File

@ -124,6 +124,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)