api: introduce api/{types,services} for deduplication of API definition

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2017-02-09 07:31:26 +00:00
parent 6527a57d7b
commit bf8abef70f
37 changed files with 2179 additions and 1753 deletions

View file

@ -4,7 +4,7 @@ import (
gocontext "context"
"errors"
"github.com/docker/containerd/api/execution"
"github.com/docker/containerd/api/services/execution"
"github.com/urfave/cli"
)

View file

@ -7,7 +7,8 @@ import (
gocontext "context"
"github.com/docker/containerd/api/execution"
"github.com/docker/containerd/api/services/execution"
"github.com/docker/containerd/api/types/process"
"github.com/urfave/cli"
)
@ -48,7 +49,7 @@ var execCommand = cli.Command{
id := context.String("id")
sOpts := &execution.StartProcessRequest{
ContainerID: id,
Process: &execution.Process{
Process: &process.Process{
Cwd: context.String("cwd"),
Terminal: context.Bool("tty"),
Args: context.Args(),

View file

@ -5,7 +5,7 @@ import (
"errors"
"github.com/davecgh/go-spew/spew"
"github.com/docker/containerd/api/execution"
"github.com/docker/containerd/api/services/execution"
"github.com/urfave/cli"
)

View file

@ -4,7 +4,7 @@ import (
gocontext "context"
"fmt"
"github.com/docker/containerd/api/execution"
"github.com/docker/containerd/api/services/execution"
"github.com/urfave/cli"
)
@ -31,7 +31,7 @@ var listCommand = cli.Command{
}
fmt.Printf("%s\t%s\t%d\t%s\n",
c.ID,
c.Status,
c.State,
len(listProcResponse.Processes),
c.Bundle,
)

View file

@ -10,7 +10,7 @@ import (
gocontext "context"
"github.com/crosbymichael/console"
"github.com/docker/containerd/api/execution"
"github.com/docker/containerd/api/services/execution"
execEvents "github.com/docker/containerd/execution"
"github.com/nats-io/go-nats"
"github.com/nats-io/go-nats-streaming"

View file

@ -18,7 +18,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/crosbymichael/console"
"github.com/docker/containerd/api/shim"
"github.com/docker/containerd/api/services/shim"
"github.com/urfave/cli"
"github.com/pkg/errors"
)

View file

@ -14,7 +14,7 @@ import (
gocontext "context"
"github.com/docker/containerd/api/execution"
"github.com/docker/containerd/api/services/execution"
"github.com/pkg/errors"
"github.com/tonistiigi/fifo"
"github.com/urfave/cli"