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

Merge pull request #362 from nalind/nameasdigest

Browse source 
Don't try to parse an image ID a second time
This commit is contained in:
Antonio Murdaca 2017-02-08 17:36:29 +01:00 committed by GitHub
commit 0639f06d03
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/storage/runtime.go
View file

@ -167,7 +167,7 @@ func (r *runtimeService) createContainerOrPodSandbox(systemContext *types.System
ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), otherRef.DockerReference().FullName())
}
if err != nil {
// maybe it's just imageID
// Maybe the image ID is sufficient?
ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), "@"+imageID)
if err != nil {
return ContainerInfo{}, err
@ -175,13 +175,6 @@ func (r *runtimeService) createContainerOrPodSandbox(systemContext *types.System
}
}
img, err := istorage.Transport.GetStoreImage(r.image.GetStore(), ref)
if img == nil && err == storage.ErrImageUnknown && imageID != "" {
ref, err = istorage.Transport.ParseStoreReference(r.image.GetStore(), "@"+imageID)
if err != nil {
return ContainerInfo{}, err
}
img, err = istorage.Transport.GetStoreImage(r.image.GetStore(), ref)
}
if img == nil && err == storage.ErrImageUnknown && imageName == r.pauseImage {
image := imageID
if imageName != "" {