From c75f4d4e70bb93e98d0573b6b01b80971b9f880d Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Tue, 26 Jun 2018 09:59:26 -0400 Subject: Add --authfile to podman search Since podman search requires credentials to search private registries, add the --authfile flag to allow users to pass in credentials from a different authfile than the default one. Signed-off-by: umohnani8 Closes: #998 Approved by: rhatdan --- cmd/podman/search.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/search.go b/cmd/podman/search.go index 96a17fb64..064badec8 100644 --- a/cmd/podman/search.go +++ b/cmd/podman/search.go @@ -23,6 +23,10 @@ const ( var ( searchFlags = []cli.Flag{ + cli.StringFlag{ + Name: "authfile", + Usage: "Path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json", + }, cli.StringSliceFlag{ Name: "filter, f", Usage: "filter output based on conditions provided (default [])", @@ -71,10 +75,11 @@ type searchParams struct { } type searchOpts struct { - filter []string - limit int - noTrunc bool - format string + filter []string + limit int + noTrunc bool + format string + authfile string } type searchFilterParams struct { @@ -105,10 +110,11 @@ func searchCmd(c *cli.Context) error { format := genSearchFormat(c.String("format")) opts := searchOpts{ - format: format, - noTrunc: c.Bool("no-trunc"), - limit: c.Int("limit"), - filter: c.StringSlice("filter"), + format: format, + noTrunc: c.Bool("no-trunc"), + limit: c.Int("limit"), + filter: c.StringSlice("filter"), + authfile: c.String("authfile"), } regAndSkipTLS, err := getRegistriesAndSkipTLS(c) if err != nil { @@ -206,7 +212,7 @@ func getSearchOutput(term string, regAndSkipTLS map[string]bool, opts searchOpts limit = opts.limit } - sc := common.GetSystemContext("", "", false) + sc := common.GetSystemContext("", opts.authfile, false) var paramsArr []searchParams for reg, skipTLS := range regAndSkipTLS { // set the SkipTLSVerify bool depending on the registry being searched through -- cgit v1.2.3-54-g00ecf