diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-07-09 12:57:12 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-07-09 14:21:15 +0200 |
| commit | 714d36b0887158c7a951813b8d04739b354dd1c0 (patch) | |
| tree | 3af5564d48031e7ca1f076e7d95dbf2eae088280 /cmd/podman/pull.go | |
| parent | f7407f2eb512e1407f8281009eb829f37405119b (diff) | |
| download | podman-714d36b0887158c7a951813b8d04739b354dd1c0.tar.gz podman-714d36b0887158c7a951813b8d04739b354dd1c0.tar.bz2 podman-714d36b0887158c7a951813b8d04739b354dd1c0.zip | |
podman: create and run honors auth file location
if the auth file was overriden, be sure create and run honors it.
Closes: https://github.com/containers/libpod/issues/3524
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
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") |