summaryrefslogtreecommitdiff
path: root/pkg/registries
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-06-16 14:06:55 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-06-19 14:47:36 +0200
commitb05888a97dbb45a205ff535538ecdd91a19c6ae3 (patch)
tree7fdfa0188f2d7c27029deb50097a71b17d3b744b /pkg/registries
parent5ec29f8d4e79500915ec79824d9eb21630205f3f (diff)
downloadpodman-b05888a97dbb45a205ff535538ecdd91a19c6ae3.tar.gz
podman-b05888a97dbb45a205ff535538ecdd91a19c6ae3.tar.bz2
podman-b05888a97dbb45a205ff535538ecdd91a19c6ae3.zip
search: allow wildcards
Allow wildcards in the search term. Note that not all registries support wildcards and it may only work with v1 registries. Note that searching implies figuring out if the specified search term includes a registry. If there's not registry detected, the search term will be used against all configured "unqualified-serach-registries" in the registries.conf. The parsing logic considers a registry to be the substring before the first slash `/`. With these changes we now not only support wildcards but arbitrary input; ultimately it's up to the registries to decide whether they support given input or not. Fixes: bugzilla.redhat.com/show_bug.cgi?id=1846629 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/registries')
-rw-r--r--pkg/registries/registries.go16
1 files changed, 0 insertions, 16 deletions
diff --git a/pkg/registries/registries.go b/pkg/registries/registries.go
index ba7de7cf9..4827b7012 100644
--- a/pkg/registries/registries.go
+++ b/pkg/registries/registries.go
@@ -3,12 +3,10 @@ package registries
import (
"os"
"path/filepath"
- "strings"
"github.com/containers/image/v5/pkg/sysregistriesv2"
"github.com/containers/image/v5/types"
"github.com/containers/libpod/pkg/rootless"
- "github.com/docker/distribution/reference"
"github.com/pkg/errors"
)
@@ -77,17 +75,3 @@ func GetInsecureRegistries() ([]string, error) {
}
return insecureRegistries, nil
}
-
-// GetRegistry returns the registry name from a string if specified
-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
-}