summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2021-06-17 20:10:17 +0200
committerMiloslav Trmač <mitr@redhat.com>2021-06-17 21:20:13 +0200
commit2bd382c8c7d3ba7f7a8e4a2921aa183118500a2a (patch)
tree74ddc0d1693748ddd52477ab7d1942b6cf2e58a9
parent725b5001a17f703d95a3c88e4f58225c5290576b (diff)
downloadpodman-2bd382c8c7d3ba7f7a8e4a2921aa183118500a2a.tar.gz
podman-2bd382c8c7d3ba7f7a8e4a2921aa183118500a2a.tar.bz2
podman-2bd382c8c7d3ba7f7a8e4a2921aa183118500a2a.zip
Fix documentation of the --format option of podman push
It affects all transports; and without --format, we try several manifest formats. [NO TESTS NEEDED] Signed-off-by: Miloslav Trmač <mitr@redhat.com>
-rw-r--r--cmd/podman/images/push.go2
-rw-r--r--pkg/domain/entities/images.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go
index edf8e9203..a13976612 100644
--- 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
index 17b82037e..3140a47c5 100644
--- 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