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

20
cmd/ctr/export.go
View File

@@ -32,27 +32,23 @@ var imagesExportCommand = cli.Command{
Value: ocispec.MediaTypeImageManifest,
},
},
Action: func(clicontext *cli.Context) error {
Action: func(context *cli.Context) error {
var (
out = clicontext.Args().First()
local = clicontext.Args().Get(1)
out = context.Args().First()
local = context.Args().Get(1)
desc ocispec.Descriptor
)
ctx, cancel := appContext(clicontext)
defer cancel()
client, err := newClient(clicontext)
client, ctx, cancel, err := newClient(context)
if err != nil {
return err
}
if manifest := clicontext.String("manifest"); manifest != "" {
defer cancel()
if manifest := context.String("manifest"); manifest != "" {
desc.Digest, err = digest.Parse(manifest)
if err != nil {
return errors.Wrap(err, "invalid manifest digest")
}
desc.MediaType = clicontext.String("manifest-type")
desc.MediaType = context.String("manifest-type")
} else {
img, err := client.ImageService().Get(ctx, local)
if err != nil {
@@ -68,7 +64,7 @@ var imagesExportCommand = cli.Command{
if ociRefName := determineOCIRefName(local); ociRefName != "" {
desc.Annotations[ocispec.AnnotationRefName] = ociRefName
}
if ociRefName := clicontext.String("oci-ref-name"); ociRefName != "" {
if ociRefName := context.String("oci-ref-name"); ociRefName != "" {
desc.Annotations[ocispec.AnnotationRefName] = ociRefName
}
}