summaryrefslogtreecommitdiff
path: root/cmd/podman/search.go
diff options
context:
space:
mode:
authorQi Wang <qiwan@redhat.com>2019-10-25 21:16:37 -0400
committerQi Wang <qiwan@redhat.com>2019-11-05 21:32:18 -0500
commitd7c0f968ca60994306c8c76cd8e4e0a677fe9ada (patch)
tree3eff712a3fbb1c58eac9d7e43a55588a56d67892 /cmd/podman/search.go
parentb4b727256c728295e6a3fcb69593347df9e90b23 (diff)
downloadpodman-d7c0f968ca60994306c8c76cd8e4e0a677fe9ada.tar.gz
podman-d7c0f968ca60994306c8c76cd8e4e0a677fe9ada.tar.bz2
podman-d7c0f968ca60994306c8c76cd8e4e0a677fe9ada.zip
fix bug check nonexist authfile
Use GetDefaultAuthFile() from buildah. For podman command(except login), if authfile does not exist returns error. close #4328 Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'cmd/podman/search.go')
-rw-r--r--cmd/podman/search.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/cmd/podman/search.go b/cmd/podman/search.go
index cdcb30a59..87a26e544 100644
--- a/cmd/podman/search.go
+++ b/cmd/podman/search.go
@@ -1,13 +1,14 @@
package main
import (
+ "os"
"reflect"
"strings"
+ buildahcli "github.com/containers/buildah/pkg/cli"
"github.com/containers/buildah/pkg/formats"
"github.com/containers/image/v5/types"
"github.com/containers/libpod/cmd/podman/cliconfig"
- "github.com/containers/libpod/cmd/podman/shared"
"github.com/containers/libpod/libpod/image"
"github.com/pkg/errors"
"github.com/spf13/cobra"
@@ -45,7 +46,7 @@ func init() {
flags.BoolVar(&searchCommand.NoTrunc, "no-trunc", false, "Do not truncate the output")
// Disabled flags for the remote client
if !remote {
- flags.StringVar(&searchCommand.Authfile, "authfile", shared.GetAuthFile(""), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override")
+ flags.StringVar(&searchCommand.Authfile, "authfile", buildahcli.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override")
flags.BoolVar(&searchCommand.TlsVerify, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries")
}
}
@@ -65,6 +66,12 @@ func searchCmd(c *cliconfig.SearchValues) error {
return err
}
+ if c.Authfile != "" {
+ if _, err := os.Stat(c.Authfile); err != nil {
+ return errors.Wrapf(err, "error getting authfile %s", c.Authfile)
+ }
+ }
+
searchOptions := image.SearchOptions{
NoTrunc: c.NoTrunc,
Limit: c.Limit,