Merge pull request containers#10711 from mtrmac/format-docs

Fix documentation of the --format option of podman push
rhatdan · Jun 17, 2021 · ce04a3e · ce04a3e
2 parents 725b500 + 2bd382c
commit ce04a3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go
@@ -96,7 +96,7 @@ func pushFlags(cmd *cobra.Command) {
 	_ = cmd.RegisterFlagCompletionFunc(digestfileFlagName, completion.AutocompleteDefault)
 
 	formatFlagName := "format"
-	flags.StringVarP(&pushOptions.Format, formatFlagName, "f", "", "Manifest type (oci, v2s2, or v2s1) to use when pushing an image using the 'dir' transport (default is manifest type of source)")
+	flags.StringVarP(&pushOptions.Format, formatFlagName, "f", "", "Manifest type (oci, v2s2, or v2s1) to use in the destination (default is manifest type of source, with fallbacks)")
 	_ = cmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteManifestFormat)
 
 	flags.BoolVarP(&pushOptions.Quiet, "quiet", "q", false, "Suppress output information when pushing images")

diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go
@@ -184,7 +184,7 @@ type ImagePushOptions struct {
 	// image to the file.  Ignored for remote calls.
 	DigestFile string
 	// Format is the Manifest type (oci, v2s1, or v2s2) to use when pushing an
-	// image using the 'dir' transport. Default is manifest type of source.
+	// image. Default is manifest type of source, with fallbacks.
 	// Ignored for remote calls.
 	Format string
 	// Quiet can be specified to suppress pull progress when pulling.  Ignored