diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-22 06:16:03 -0400 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-22 12:55:23 -0400 |
commit | 35567e706b5009ead40c0eaef7c5c1199cd8d448 (patch) | |
tree | b3b35b1b94a8521f1ac08c85cdd514172e4ea554 /cmd/podman/images | |
parent | c8d64264c924833440237bf766a05db0cea56a1c (diff) | |
download | podman-35567e706b5009ead40c0eaef7c5c1199cd8d448.tar.gz podman-35567e706b5009ead40c0eaef7c5c1199cd8d448.tar.bz2 podman-35567e706b5009ead40c0eaef7c5c1199cd8d448.zip |
Attempt to turn on additional build tests
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/images')
-rw-r--r-- | cmd/podman/images/build.go | 1 | ||||
-rw-r--r-- | cmd/podman/images/list.go | 1 | ||||
-rw-r--r-- | cmd/podman/images/load.go | 5 | ||||
-rw-r--r-- | cmd/podman/images/pull.go | 2 | ||||
-rw-r--r-- | cmd/podman/images/push.go | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 06a7efd25..2efc795cd 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -126,6 +126,7 @@ func buildFlags(flags *pflag.FlagSet) { os.Exit(1) } flags.AddFlagSet(&fromAndBudFlags) + _ = flags.MarkHidden("signature-policy") } // build executes the build command. diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 022c90f71..4f8948b8b 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -74,7 +74,6 @@ func imageListFlagSet(flags *pflag.FlagSet) { flags.BoolVar(&listFlag.digests, "digests", false, "Show digests") flags.BoolVarP(&listFlag.noHeading, "noheading", "n", false, "Do not print column headings") flags.BoolVar(&listFlag.noTrunc, "no-trunc", false, "Do not truncate output") - flags.BoolVar(&listFlag.noTrunc, "notruncate", false, "Do not truncate output") flags.BoolVarP(&listFlag.quiet, "quiet", "q", false, "Display only image IDs") flags.StringVar(&listFlag.sort, "sort", "created", "Sort by "+sortFields.String()) flags.BoolVarP(&listFlag.history, "history", "", false, "Display the image name history") diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index 4bbffd432..a984ad81f 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -60,10 +60,7 @@ func loadFlags(flags *pflag.FlagSet) { flags.StringVarP(&loadOpts.Input, "input", "i", "", "Read from specified archive file (default: stdin)") flags.BoolVarP(&loadOpts.Quiet, "quiet", "q", false, "Suppress the output") flags.StringVar(&loadOpts.SignaturePolicy, "signature-policy", "", "Pathname of signature policy file") - if registry.IsRemote() { - _ = flags.MarkHidden("signature-policy") - } - + _ = flags.MarkHidden("signature-policy") } func load(cmd *cobra.Command, args []string) error { diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 9e883703f..7bb4f6d37 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -87,9 +87,9 @@ func pullFlags(flags *pflag.FlagSet) { if registry.IsRemote() { _ = flags.MarkHidden("authfile") _ = flags.MarkHidden("cert-dir") - _ = flags.MarkHidden("signature-policy") _ = flags.MarkHidden("tls-verify") } + _ = flags.MarkHidden("signature-policy") } // imagePull is implement the command for pulling images. diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index dd536213f..35a6254de 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -87,9 +87,9 @@ func pushFlags(flags *pflag.FlagSet) { _ = flags.MarkHidden("cert-dir") _ = flags.MarkHidden("compress") _ = flags.MarkHidden("quiet") - _ = flags.MarkHidden("signature-policy") _ = flags.MarkHidden("tls-verify") } + _ = flags.MarkHidden("signature-policy") } // imagePush is implement the command for pushing images. |