mirror of
https://github.com/containers/podman.git
synced 2025-09-27 16:54:42 +08:00
Move secrets package to buildah
Trying to remove circular dependencies between libpod and buildah. First step to move pkg content from libpod to buildah. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
18
vendor/github.com/containers/buildah/util/util.go
generated
vendored
18
vendor/github.com/containers/buildah/util/util.go
generated
vendored
@ -20,7 +20,7 @@ import (
|
||||
"github.com/containers/storage"
|
||||
"github.com/containers/storage/pkg/idtools"
|
||||
"github.com/docker/distribution/registry/api/errcode"
|
||||
"github.com/opencontainers/runtime-spec/specs-go"
|
||||
specs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
@ -47,6 +47,12 @@ var (
|
||||
// correspond to in the set of configured registries, the transport used to
|
||||
// pull the image, and a boolean which is true iff
|
||||
// 1) the list of search registries was used, and 2) it was empty.
|
||||
//
|
||||
// The returned image names never include a transport: prefix, and if transport != "",
|
||||
// (transport, image) should be a valid input to alltransports.ParseImageName.
|
||||
// transport == "" indicates that image that already exists in a local storage,
|
||||
// and the name is valid for store.Image() / storage.Transport.ParseStoreReference().
|
||||
//
|
||||
// NOTE: The "list of search registries is empty" check does not count blocked registries,
|
||||
// and neither the implied "localhost" nor a possible firstRegistry are counted
|
||||
func ResolveName(name string, firstRegistry string, sc *types.SystemContext, store storage.Store) ([]string, string, bool, error) {
|
||||
@ -162,15 +168,7 @@ func ExpandNames(names []string, firstRegistry string, systemContext *types.Syst
|
||||
name = named
|
||||
}
|
||||
name = reference.TagNameOnly(name)
|
||||
tag := ""
|
||||
digest := ""
|
||||
if tagged, ok := name.(reference.NamedTagged); ok {
|
||||
tag = ":" + tagged.Tag()
|
||||
}
|
||||
if digested, ok := name.(reference.Digested); ok {
|
||||
digest = "@" + digested.Digest().String()
|
||||
}
|
||||
expanded = append(expanded, name.Name()+tag+digest)
|
||||
expanded = append(expanded, name.String())
|
||||
}
|
||||
return expanded, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user