diff options
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/search.go | 16 | ||||
| -rw-r--r-- | cmd/podman/varlink/io.podman.varlink | 6 |
2 files changed, 5 insertions, 17 deletions
diff --git a/cmd/podman/search.go b/cmd/podman/search.go index 2febee689..858addff6 100644 --- a/cmd/podman/search.go +++ b/cmd/podman/search.go @@ -12,7 +12,6 @@ import ( "github.com/containers/libpod/cmd/podman/formats" "github.com/containers/libpod/libpod/common" sysreg "github.com/containers/libpod/pkg/registries" - "github.com/docker/distribution/reference" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -88,7 +87,7 @@ func searchCmd(c *cliconfig.SearchValues) error { term := args[0] // Check if search term has a registry in it - registry, err := getRegistry(term) + registry, err := sysreg.GetRegistry(term) if err != nil { return errors.Wrapf(err, "error getting registry from %q", term) } @@ -301,16 +300,3 @@ func matchesOfficialFilter(filter searchFilterParams, result docker.SearchResult } return true } - -func getRegistry(image string) (string, error) { - // It is possible to only have the registry name in the format "myregistry/" - // if so, just trim the "/" from the end and return the registry name - if strings.HasSuffix(image, "/") { - return strings.TrimSuffix(image, "/"), nil - } - imgRef, err := reference.Parse(image) - if err != nil { - return "", err - } - return reference.Domain(imgRef.(reference.Named)), nil -} diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink index 697d9ed90..90cadf2b4 100644 --- a/cmd/podman/varlink/io.podman.varlink +++ b/cmd/podman/varlink/io.podman.varlink @@ -67,6 +67,7 @@ type ImageSearchResult ( description: string, is_official: bool, is_automated: bool, + registry: string, name: string, star_count: int ) @@ -600,8 +601,9 @@ method GetAttachSockets(name: string) -> (sockets: Sockets) # a [ContainerNotFound](#ContainerNotFound) error is returned. method WaitContainer(name: string) -> (exitcode: int) -# RemoveContainer takes requires the name or ID of container as well a boolean representing whether a running and a boolean indicating whether to remove builtin volumes -# container can be stopped and removed. Upon successful removal of the container, its ID is returned. If the +# RemoveContainer requires the name or ID of container as well a boolean representing whether a running container can be stopped and removed, and a boolean +# indicating whether to remove builtin volumes. Upon successful removal of the +# container, its ID is returned. If the # container cannot be found by name or ID, a [ContainerNotFound](#ContainerNotFound) error will be returned. # #### Example # ~~~ |