diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-17 18:34:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 18:34:24 -0400 |
| commit | ce04a3e17f5d5ac1d0ac29302dc6e6d98edf28eb (patch) | |
| tree | 74ddc0d1693748ddd52477ab7d1942b6cf2e58a9 | |
| parent | 725b5001a17f703d95a3c88e4f58225c5290576b (diff) | |
| parent | 2bd382c8c7d3ba7f7a8e4a2921aa183118500a2a (diff) | |
| download | podman-ce04a3e17f5d5ac1d0ac29302dc6e6d98edf28eb.tar.gz podman-ce04a3e17f5d5ac1d0ac29302dc6e6d98edf28eb.tar.bz2 podman-ce04a3e17f5d5ac1d0ac29302dc6e6d98edf28eb.zip | |
Merge pull request #10711 from mtrmac/format-docs
Fix documentation of the --format option of podman push
| -rw-r--r-- | cmd/podman/images/push.go | 2 | ||||
| -rw-r--r-- | pkg/domain/entities/images.go | 2 |
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 |