dep: Update containers/image to 1d7e25b91705e4d1cddb5396baf112caeb1119f3
Signed-off-by: Andrew Pilloud <andrewpilloud@igneoussystems.com>
This commit is contained in:
parent
54c176e336
commit
de9995d5f0
84 changed files with 3091 additions and 748 deletions
6
vendor/github.com/containers/image/storage/storage_image.go
generated
vendored
6
vendor/github.com/containers/image/storage/storage_image.go
generated
vendored
|
@ -118,10 +118,12 @@ func (s storageImageDestination) Reference() types.ImageReference {
|
|||
return s.imageRef
|
||||
}
|
||||
|
||||
func (s storageImageSource) Close() {
|
||||
func (s storageImageSource) Close() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s storageImageDestination) Close() {
|
||||
func (s storageImageDestination) Close() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s storageImageDestination) ShouldCompressLayers() bool {
|
||||
|
|
2
vendor/github.com/containers/image/storage/storage_reference.go
generated
vendored
2
vendor/github.com/containers/image/storage/storage_reference.go
generated
vendored
|
@ -87,7 +87,7 @@ func (s storageReference) PolicyConfigurationNamespaces() []string {
|
|||
// The reference without the ID is also a valid namespace.
|
||||
namespaces = append(namespaces, storeSpec+s.reference)
|
||||
}
|
||||
components := strings.Split(s.name.FullName(), "/")
|
||||
components := strings.Split(s.name.Name(), "/")
|
||||
for len(components) > 0 {
|
||||
namespaces = append(namespaces, storeSpec+strings.Join(components, "/"))
|
||||
components = components[:len(components)-1]
|
||||
|
|
2
vendor/github.com/containers/image/storage/storage_reference_test.go
generated
vendored
2
vendor/github.com/containers/image/storage/storage_reference_test.go
generated
vendored
|
@ -23,7 +23,7 @@ func TestStorageReferenceDockerReference(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
dr := ref.DockerReference()
|
||||
require.NotNil(t, dr)
|
||||
assert.Equal(t, "busybox:latest", dr.String())
|
||||
assert.Equal(t, "docker.io/library/busybox:latest", dr.String())
|
||||
|
||||
ref, err = Transport.ParseReference("@" + sha256digestHex)
|
||||
require.NoError(t, err)
|
||||
|
|
19
vendor/github.com/containers/image/storage/storage_transport.go
generated
vendored
19
vendor/github.com/containers/image/storage/storage_transport.go
generated
vendored
|
@ -9,12 +9,17 @@ import (
|
|||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/containers/image/docker/reference"
|
||||
"github.com/containers/image/transports"
|
||||
"github.com/containers/image/types"
|
||||
"github.com/containers/storage/storage"
|
||||
"github.com/opencontainers/go-digest"
|
||||
ddigest "github.com/opencontainers/go-digest"
|
||||
)
|
||||
|
||||
func init() {
|
||||
transports.Register(Transport)
|
||||
}
|
||||
|
||||
var (
|
||||
// Transport is an ImageTransport that uses either a default
|
||||
// storage.Store or one that's it's explicitly told to use.
|
||||
|
@ -83,14 +88,14 @@ func (s storageTransport) ParseStoreReference(store storage.Store, ref string) (
|
|||
refInfo := strings.SplitN(ref, "@", 2)
|
||||
if len(refInfo) == 1 {
|
||||
// A name.
|
||||
name, err = reference.ParseNamed(refInfo[0])
|
||||
name, err = reference.ParseNormalizedNamed(refInfo[0])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else if len(refInfo) == 2 {
|
||||
// An ID, possibly preceded by a name.
|
||||
if refInfo[0] != "" {
|
||||
name, err = reference.ParseNamed(refInfo[0])
|
||||
name, err = reference.ParseNormalizedNamed(refInfo[0])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -111,7 +116,7 @@ func (s storageTransport) ParseStoreReference(store storage.Store, ref string) (
|
|||
}
|
||||
refname := ""
|
||||
if name != nil {
|
||||
name = reference.WithDefaultTag(name)
|
||||
name = reference.TagNameOnly(name)
|
||||
refname = verboseName(name)
|
||||
}
|
||||
if refname == "" {
|
||||
|
@ -257,12 +262,12 @@ func (s storageTransport) ValidatePolicyConfigurationScope(scope string) error {
|
|||
// that are just bare IDs.
|
||||
scopeInfo := strings.SplitN(scope, "@", 2)
|
||||
if len(scopeInfo) == 1 && scopeInfo[0] != "" {
|
||||
_, err := reference.ParseNamed(scopeInfo[0])
|
||||
_, err := reference.ParseNormalizedNamed(scopeInfo[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else if len(scopeInfo) == 2 && scopeInfo[0] != "" && scopeInfo[1] != "" {
|
||||
_, err := reference.ParseNamed(scopeInfo[0])
|
||||
_, err := reference.ParseNormalizedNamed(scopeInfo[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
@ -277,10 +282,10 @@ func (s storageTransport) ValidatePolicyConfigurationScope(scope string) error {
|
|||
}
|
||||
|
||||
func verboseName(name reference.Named) string {
|
||||
name = reference.WithDefaultTag(name)
|
||||
name = reference.TagNameOnly(name)
|
||||
tag := ""
|
||||
if tagged, ok := name.(reference.NamedTagged); ok {
|
||||
tag = tagged.Tag()
|
||||
}
|
||||
return name.FullName() + ":" + tag
|
||||
return name.Name() + ":" + tag
|
||||
}
|
||||
|
|
2
vendor/github.com/containers/image/storage/storage_transport_test.go
generated
vendored
2
vendor/github.com/containers/image/storage/storage_transport_test.go
generated
vendored
|
@ -54,7 +54,7 @@ func TestTransportParseStoreReference(t *testing.T) {
|
|||
if c.expectedRef == "" {
|
||||
assert.Nil(t, storageRef.name, c.input)
|
||||
} else {
|
||||
dockerRef, err := reference.ParseNamed(c.expectedRef)
|
||||
dockerRef, err := reference.ParseNormalizedNamed(c.expectedRef)
|
||||
require.NoError(t, err)
|
||||
require.NotNil(t, storageRef.name, c.input)
|
||||
assert.Equal(t, dockerRef.String(), storageRef.name.String())
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue