diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-08 22:06:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 22:06:34 +0100 |
| commit | f456ce90f966f2eefdfc27ca83541ceacc4a298d (patch) | |
| tree | 24f39eb6404de474cb2e2d41acc2a3ace8410ce5 /cmd/podman/common.go | |
| parent | 651d6ebe5274a892ce64819bb007080895f98321 (diff) | |
| parent | d7c0f968ca60994306c8c76cd8e4e0a677fe9ada (diff) | |
| download | podman-f456ce90f966f2eefdfc27ca83541ceacc4a298d.tar.gz podman-f456ce90f966f2eefdfc27ca83541ceacc4a298d.tar.bz2 podman-f456ce90f966f2eefdfc27ca83541ceacc4a298d.zip | |
Merge pull request #4337 from QiWang19/check_auth_path
fix bug check nonexist authfile
Diffstat (limited to 'cmd/podman/common.go')
| -rw-r--r-- | cmd/podman/common.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 3e86b8e20..4db043f31 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/containers/buildah" + buildahcli "github.com/containers/buildah/pkg/cli" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/sysinfo" @@ -112,7 +112,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { "Attach to STDIN, STDOUT or STDERR (default [])", ) createFlags.String( - "authfile", shared.GetAuthFile(""), + "authfile", buildahcli.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override", ) createFlags.String( |