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

Merge pull request #1654 from crosbymichael/ctr-daemon

Browse Source 
[ctr] add --null-io and --detach
This commit is contained in:
Michael Crosby 2017-10-23 10:40:57 -04:00 committed by GitHub
commit 313bab3dd6
4 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/ctr/run.go
View File

@ -92,6 +92,14 @@ var runCommand = cli.Command{
Name: "cwd",
Usage: "specify the working directory of the process",
},
cli.BoolFlag{
Name: "null-io",
Usage: "send all IO to /dev/null",
},
cli.BoolFlag{
Name: "detach,d",
Usage: "detach from the task after it has started execution",
},
}, snapshotterFlags...),
Action: func(context *cli.Context) error {
var (
@ -101,6 +109,7 @@ var runCommand = cli.Command{
id = context.Args().Get(1)
imageRef = context.Args().First()
tty = context.Bool("tty")
detach = context.Bool("detach")
)
defer cancel()
@ -118,20 +127,20 @@ var runCommand = cli.Command{
if err != nil {
return err
}
if context.Bool("rm") {
if context.Bool("rm") && !detach {
defer container.Delete(ctx, containerd.WithSnapshotCleanup)
}
task, err := newTask(ctx, client, container, context.String("checkpoint"), tty)
task, err := newTask(ctx, client, container, context.String("checkpoint"), tty, context.Bool("null-io"))
if err != nil {
return err
}
defer task.Delete(ctx)
statusC, err := task.Wait(ctx)
if err != nil {
return err
var statusC <-chan containerd.ExitStatus
if !detach {
defer task.Delete(ctx)
if statusC, err = task.Wait(ctx); err != nil {
return err
}
}
var con console.Console
if tty {
con = console.Current()
@ -143,6 +152,9 @@ var runCommand = cli.Command{
if err := task.Start(ctx); err != nil {
return err
}
if detach {
return nil
}
if tty {
if err := handleConsoleResize(ctx, task, con); err != nil {
logrus.WithError(err).Error("console resize")
@ -151,7 +163,6 @@ var runCommand = cli.Command{
sigc := forwardAllSignals(ctx, task)
defer stopCatch(sigc)
}
status := <-statusC
code, _, err := status.Result()
if err != nil {

5
cmd/ctr/run_unix.go
View File

@ -114,12 +114,15 @@ func newContainer(ctx gocontext.Context, client *containerd.Client, context *cli
return client.NewContainer(ctx, id, cOpts...)
}
func newTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, checkpoint string, tty bool) (containerd.Task, error) {
func newTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, checkpoint string, tty, nullIO bool) (containerd.Task, error) {
if checkpoint == "" {
io := containerd.Stdio
if tty {
io = containerd.StdioTerminal
}
if nullIO {
io = containerd.NullIO
}
return container.NewTask(ctx, io)
}
im, err := client.GetImage(ctx, checkpoint)

5
cmd/ctr/run_windows.go
View File

@ -117,10 +117,13 @@ func newContainer(ctx gocontext.Context, client *containerd.Client, context *cli
)
}
func newTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, _ string, tty bool) (containerd.Task, error) {
func newTask(ctx gocontext.Context, client *containerd.Client, container containerd.Container, _ string, tty, nullIO bool) (containerd.Task, error) {
io := containerd.Stdio
if tty {
io = containerd.StdioTerminal
}
if nullIO {
io = containerd.NullIO
}
return container.NewTask(ctx, io)
}

8
cmd/ctr/start.go
View File

@ -11,6 +11,12 @@ var taskStartCommand = cli.Command{
Name: "start",
Usage: "start a container that have been created",
ArgsUsage: "CONTAINER",
Flags: []cli.Flag{
cli.BoolFlag{
Name: "null-io",
Usage: "send all IO to /dev/null",
},
},
Action: func(context *cli.Context) error {
var (
err error
@ -40,7 +46,7 @@ var taskStartCommand = cli.Command{
tty := spec.Process.Terminal
task, err := newTask(ctx, client, container, "", tty)
task, err := newTask(ctx, client, container, "", tty, context.Bool("null-io"))
if err != nil {
return err
}