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

storage: Support latest containers/image

Browse source 
Signed-off-by: Andrew Pilloud <andrewpilloud@igneoussystems.com>
This commit is contained in:
Andrew Pilloud 2017-03-13 08:16:03 -07:00
parent ee3027f8be
commit 54c176e336
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/storage/runtime.go
View file

@ -9,7 +9,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/containers/image/copy"
istorage "github.com/containers/image/storage"
"github.com/containers/image/transports"
"github.com/containers/image/transports/alltransports"
"github.com/containers/image/types"
"github.com/containers/storage/storage"
"github.com/opencontainers/image-spec/specs-go/v1"
@ -162,9 +162,9 @@ func (r *runtimeService) createContainerOrPodSandbox(systemContext *types.System
ref, err := istorage.Transport.ParseStoreReference(r.image.GetStore(), imageName)
if err != nil {
// Maybe it's some other transport's copy of the image?
otherRef, err2 := transports.ParseImageName(imageName)
otherRef, err2 := alltransports.ParseImageName(imageName)
if err2 == nil && otherRef.DockerReference() != nil {
ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), otherRef.DockerReference().FullName())
ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), otherRef.DockerReference().Name())
}
if err != nil {
// Maybe the image ID is sufficient?