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

Refactor newClient in ctr

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-10-23 13:38:15 -04:00
parent edf4114d55
commit 9f76083a8f
30 changed files with 299 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/ctr/run.go
View File

@@ -105,13 +105,11 @@ var runCommand = cli.Command{
var (
err error
ctx, cancel = appContext(context)
id = context.Args().Get(1)
imageRef = context.Args().First()
tty = context.Bool("tty")
detach = context.Bool("detach")
id = context.Args().Get(1)
imageRef = context.Args().First()
tty = context.Bool("tty")
detach = context.Bool("detach")
)
defer cancel()
if imageRef == "" {
return errors.New("image ref must be provided")
@@ -119,10 +117,11 @@ var runCommand = cli.Command{
if id == "" {
return errors.New("container id must be provided")
}
client, err := newClient(context)
client, ctx, cancel, err := newClient(context)
if err != nil {
return err
}
defer cancel()
container, err := newContainer(ctx, client, context)
if err != nil {
return err