diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-15 15:53:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-15 15:53:16 +0100 |
commit | a50d0837b633bf780b32a20b8d4f23ccd9521c8d (patch) | |
tree | 6b24e2243b6a8178ba9581de545d21df82bdb4d5 /cmd/podman/manifest/add.go | |
parent | b84131eef879049a43f7cd00831575fa118cdefb (diff) | |
parent | 8a7e70919f4bab0757523ae97c170396cb13c83d (diff) | |
download | podman-a50d0837b633bf780b32a20b8d4f23ccd9521c8d.tar.gz podman-a50d0837b633bf780b32a20b8d4f23ccd9521c8d.tar.bz2 podman-a50d0837b633bf780b32a20b8d4f23ccd9521c8d.zip |
Merge pull request #12527 from jwhonce/wip/manifest4
Refactor manifest list operations
Diffstat (limited to 'cmd/podman/manifest/add.go')
-rw-r--r-- | cmd/podman/manifest/add.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmd/podman/manifest/add.go b/cmd/podman/manifest/add.go index 9d219601c..d09533967 100644 --- a/cmd/podman/manifest/add.go +++ b/cmd/podman/manifest/add.go @@ -26,14 +26,14 @@ type manifestAddOptsWrapper struct { var ( manifestAddOpts = manifestAddOptsWrapper{} addCmd = &cobra.Command{ - Use: "add [options] LIST LIST", + Use: "add [options] LIST IMAGE [IMAGE...]", Short: "Add images to a manifest list or image index", Long: "Adds an image to a manifest list or image index.", RunE: add, + Args: cobra.MinimumNArgs(2), ValidArgsFunction: common.AutocompleteImages, Example: `podman manifest add mylist:v1.11 image:v1.11-amd64 podman manifest add mylist:v1.11 transport:imageName`, - Args: cobra.ExactArgs(2), } ) @@ -93,10 +93,6 @@ func add(cmd *cobra.Command, args []string) error { return err } - // FIXME: (@vrothberg) this interface confuses me a lot. Why are they - // not two arguments? - manifestAddOpts.Images = []string{args[1], args[0]} - if manifestAddOpts.CredentialsCLI != "" { creds, err := util.ParseRegistryCreds(manifestAddOpts.CredentialsCLI) if err != nil { @@ -114,10 +110,10 @@ func add(cmd *cobra.Command, args []string) error { manifestAddOpts.SkipTLSVerify = types.NewOptionalBool(!manifestAddOpts.TLSVerifyCLI) } - listID, err := registry.ImageEngine().ManifestAdd(context.Background(), manifestAddOpts.ManifestAddOptions) + listID, err := registry.ImageEngine().ManifestAdd(context.Background(), args[0], args[1:], manifestAddOpts.ManifestAddOptions) if err != nil { return err } - fmt.Printf("%s\n", listID) + fmt.Println(listID) return nil } |