diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-04 11:08:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 11:08:43 +0200 |
| commit | 51d0be42046f691e81cddfe2712baa14cecbdfbe (patch) | |
| tree | 31a4708b600b60a5a9c5529637721f1a5d88e195 /cmd/podman/images/search.go | |
| parent | 7b941462d42aa76b134462ff92a6823359d2cf76 (diff) | |
| parent | 7d37f4bbfee8def704cf38ec74f91e3e0db61723 (diff) | |
| download | podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.tar.gz podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.tar.bz2 podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.zip | |
Merge pull request #6051 from rhatdan/containers.conf
Fixes for test/e2e/containers_conf_test.go
Diffstat (limited to 'cmd/podman/images/search.go')
| -rw-r--r-- | cmd/podman/images/search.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go index a259b2419..640d497c3 100644 --- a/cmd/podman/images/search.go +++ b/cmd/podman/images/search.go @@ -5,8 +5,8 @@ import ( "reflect" "strings" - buildahcli "github.com/containers/buildah/pkg/cli" "github.com/containers/buildah/pkg/formats" + "github.com/containers/common/pkg/auth" "github.com/containers/image/v5/types" "github.com/containers/libpod/cmd/podman/registry" "github.com/containers/libpod/pkg/domain/entities" @@ -87,7 +87,7 @@ func searchFlags(flags *pflag.FlagSet) { flags.StringVar(&searchOptions.Format, "format", "", "Change the output format to a Go template") flags.IntVar(&searchOptions.Limit, "limit", 0, "Limit the number of results") flags.BoolVar(&searchOptions.NoTrunc, "no-trunc", false, "Do not truncate the output") - flags.StringVar(&searchOptions.Authfile, "authfile", buildahcli.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") + flags.StringVar(&searchOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override") flags.BoolVar(&searchOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries") if registry.IsRemote() { _ = flags.MarkHidden("authfile") |