diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-20 15:34:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 15:34:56 -0400 |
| commit | 4822cc8cabce33732cb210103aaa208f81102c5d (patch) | |
| tree | 366b14e2215e42ddbe7630be59b2e4bcde9b04b8 /cmd/podman/images | |
| parent | 6961b9475dbcbc6112d9c6022ac264c923ce083d (diff) | |
| parent | 3d2ad0f97a35617f76f30d02bbfa8aa1a7c1f958 (diff) | |
| download | podman-4822cc8cabce33732cb210103aaa208f81102c5d.tar.gz podman-4822cc8cabce33732cb210103aaa208f81102c5d.tar.bz2 podman-4822cc8cabce33732cb210103aaa208f81102c5d.zip | |
Merge pull request #8042 from rhatdan/tlsverify
--tls-verify and --authfile should work for all remote commands
Diffstat (limited to 'cmd/podman/images')
| -rw-r--r-- | cmd/podman/images/pull.go | 4 | ||||
| -rw-r--r-- | cmd/podman/images/push.go | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 448543b4d..595a2165e 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -84,11 +84,11 @@ func pullFlags(flags *pflag.FlagSet) { flags.Bool("disable-content-trust", false, "This is a Docker specific option and is a NOOP") flags.BoolVarP(&pullOptions.Quiet, "quiet", "q", false, "Suppress output information when pulling images") flags.StringVar(&pullOptions.SignaturePolicy, "signature-policy", "", "`Pathname` of signature policy file (not usually used)") + flags.BoolVar(&pullOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries") + flags.StringVar(&pullOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") if !registry.IsRemote() { - flags.StringVar(&pullOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") flags.StringVar(&pullOptions.CertDir, "cert-dir", "", "`Pathname` of a directory containing TLS certificates and keys") - flags.BoolVar(&pullOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries") } _ = flags.MarkHidden("signature-policy") } diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go index 2943cccc9..24192eccd 100644 --- a/cmd/podman/images/push.go +++ b/cmd/podman/images/push.go @@ -88,11 +88,9 @@ func pushFlags(flags *pflag.FlagSet) { flags.BoolVar(&pushOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries") if registry.IsRemote() { - _ = flags.MarkHidden("authfile") _ = flags.MarkHidden("cert-dir") _ = flags.MarkHidden("compress") _ = flags.MarkHidden("quiet") - _ = flags.MarkHidden("tls-verify") } _ = flags.MarkHidden("signature-policy") } |