vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix issue with official images and manifest lits

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-09-13 19:01:06 +02:00
parent 05713958f2
commit 22f96b1806
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
21 changed files with 62 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libpod/images/copy_ref.go
View file

@ -59,7 +59,7 @@ type copySource struct {
// NewImage creates a new image from the given system context
func (c *CopyRef) NewImage(sc *types.SystemContext) (types.Image, error) {
src, err := c.NewImageSource(sc, nil)
src, err := c.NewImageSource(sc)
if err != nil {
return nil, err
}
@ -82,10 +82,9 @@ func selectManifestType(preferred string, acceptable, supported []string) string
}
// NewImageSource creates a new image source from the given system context and manifest
func (c *CopyRef) NewImageSource(sc *types.SystemContext, manifestTypes []string) (src types.ImageSource, err error) {
func (c *CopyRef) NewImageSource(sc *types.SystemContext) (src types.ImageSource, err error) {
// Decide which type of manifest and configuration output we're going to provide.
supportedManifestTypes := []string{v1.MediaTypeImageManifest, docker.V2S2MediaTypeManifest}
manifestType := selectManifestType(c.preferredManifestType, manifestTypes, supportedManifestTypes)
manifestType := selectManifestType(c.preferredManifestType, nil, nil)
// If it's not a format we support, return an error.
if manifestType != v1.MediaTypeImageManifest && manifestType != docker.V2S2MediaTypeManifest {
return nil, errors.Errorf("no supported manifest types (attempted to use %q, only know %q and %q)",