diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-21 13:43:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 13:43:58 -0400 |
| commit | e5b3563a897395030c5714ac014bbad79f24ede9 (patch) | |
| tree | 6a1f676671c1e94a26d2bb7dbc19618c91198f75 /cmd/podman/images/pull.go | |
| parent | 26410e4f4e2a93f2e9ecc2cda7ef59d888285b39 (diff) | |
| parent | fc52aa6704c77c4fcd87471b90d688e7b8315f28 (diff) | |
| download | podman-e5b3563a897395030c5714ac014bbad79f24ede9.tar.gz podman-e5b3563a897395030c5714ac014bbad79f24ede9.tar.bz2 podman-e5b3563a897395030c5714ac014bbad79f24ede9.zip | |
Merge pull request #7036 from rhatdan/docker
Add noop function disable-content-trust
Diffstat (limited to 'cmd/podman/images/pull.go')
| -rw-r--r-- | cmd/podman/images/pull.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go index 83bb186df..c10a351d8 100644 --- a/cmd/podman/images/pull.go +++ b/cmd/podman/images/pull.go @@ -82,6 +82,7 @@ func pullFlags(flags *pflag.FlagSet) { flags.StringVar(&pullOptions.CredentialsCLI, "creds", "", "`Credentials` (USERNAME:PASSWORD) to use for authenticating to a registry") flags.StringVar(&pullOptions.OverrideArch, "override-arch", "", "Use `ARCH` instead of the architecture of the machine for choosing images") flags.StringVar(&pullOptions.OverrideOS, "override-os", "", "Use `OS` instead of the running OS for choosing images") + 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") |