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

Merge pull request #2066 from estesp/error-no-image

Browse Source 
Add error return for missing params in ctr images
This commit is contained in:
Michael Crosby 2018-01-26 11:47:05 -05:00 committed by GitHub
commit fc63a6cc3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/ctr/commands/images/export.go
View File

@ -43,6 +43,9 @@ Currently, only OCI format is supported.
local = context.Args().Get(1) local = context.Args().Get(1)
desc ocispec.Descriptor desc ocispec.Descriptor
) )
if out == "" || local == "" {
return errors.New("please provide both an output filename and an image reference to export")
}
client, ctx, cancel, err := commands.NewClient(context) client, ctx, cancel, err := commands.NewClient(context)
if err != nil { if err != nil {
return err return err

4
cmd/ctr/commands/images/pull.go
View File

@ -27,7 +27,9 @@ command. As part of this process, we do the following:
var ( var (
ref = context.Args().First() ref = context.Args().First()
) )
if ref == "" {
return fmt.Errorf("please provide an image reference to pull")
}
ctx, cancel := commands.AppContext(context) ctx, cancel := commands.AppContext(context)
defer cancel() defer cancel()

3
cmd/ctr/commands/images/push.go
View File

@ -49,6 +49,9 @@ var pushCommand = cli.Command{
local = context.Args().Get(1) local = context.Args().Get(1)
desc ocispec.Descriptor desc ocispec.Descriptor
) )
if ref == "" {
return errors.New("please provide a remote image reference to push")
}
client, ctx, cancel, err := commands.NewClient(context) client, ctx, cancel, err := commands.NewClient(context)
if err != nil { if err != nil {
return err return err