diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-09 15:33:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-09 15:33:16 +0200 |
| commit | eb4b7ed12bd831ac14cc6a6eea542d61900cb159 (patch) | |
| tree | c04f7b650786cea74cb72de19927e8016e01598d /cmd/podman/pull.go | |
| parent | cea0e93a658f10cc46b56cb9b00ac8b824bc8b02 (diff) | |
| parent | 714d36b0887158c7a951813b8d04739b354dd1c0 (diff) | |
| download | podman-eb4b7ed12bd831ac14cc6a6eea542d61900cb159.tar.gz podman-eb4b7ed12bd831ac14cc6a6eea542d61900cb159.tar.bz2 podman-eb4b7ed12bd831ac14cc6a6eea542d61900cb159.zip | |
Merge pull request #3528 from giuseppe/fix-auth-location
podman: create and run honors auth file location
Diffstat (limited to 'cmd/podman/pull.go')
| -rw-r--r-- | cmd/podman/pull.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index a05c78928..61cf1fd4d 100644 --- a/cmd/podman/pull.go +++ b/cmd/podman/pull.go @@ -11,6 +11,7 @@ import ( "github.com/containers/image/transports/alltransports" "github.com/containers/image/types" "github.com/containers/libpod/cmd/podman/cliconfig" + "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/adapter" "github.com/containers/libpod/pkg/util" @@ -55,7 +56,7 @@ func init() { flags.BoolVarP(&pullCommand.Quiet, "quiet", "q", false, "Suppress output information when pulling images") // Disabled flags for the remote client if !remote { - flags.StringVar(&pullCommand.Authfile, "authfile", getAuthFile(""), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") + flags.StringVar(&pullCommand.Authfile, "authfile", shared.GetAuthFile(""), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") flags.StringVar(&pullCommand.CertDir, "cert-dir", "", "`Pathname` of a directory containing TLS certificates and keys") flags.StringVar(&pullCommand.SignaturePolicy, "signature-policy", "", "`Pathname` of signature policy file (not usually used)") flags.BoolVar(&pullCommand.TlsVerify, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries") |