containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2861 from baude/varlinkimagepanic 

Correct varlink pull panic
This commit is contained in:
OpenShift Merge Robot 2019-04-08 10:51:55 -07:00 committed by GitHub
parent 93790b2c6b 340c6cfb72
commit c94903ab45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/varlinkapi/images.go
View File

@ -628,7 +628,6 @@ func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string, certDir, c
output := bytes.NewBuffer([]byte{}) output := bytes.NewBuffer([]byte{})
c := make(chan error) c := make(chan error)
go func() { go func() {
//err := newImage.PushImageToHeuristicDestination(getContext(), destname, manifestType, "", signaturePolicy, output, compress, so, &dockerRegistryOptions, nil)
if strings.HasPrefix(name, dockerarchive.Transport.Name()+":") { if strings.HasPrefix(name, dockerarchive.Transport.Name()+":") {
srcRef, err := alltransports.ParseImageName(name) srcRef, err := alltransports.ParseImageName(name)
if err != nil { if err != nil {
@ -637,14 +636,16 @@ func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string, certDir, c
newImage, err := i.Runtime.ImageRuntime().LoadFromArchiveReference(getContext(), srcRef, signaturePolicy, output) newImage, err := i.Runtime.ImageRuntime().LoadFromArchiveReference(getContext(), srcRef, signaturePolicy, output)
if err != nil { if err != nil {
c <- errors.Wrapf(err, "error pulling image from %q", name) c <- errors.Wrapf(err, "error pulling image from %q", name)
} else {
imageID = newImage[0].ID()
} }
imageID = newImage[0].ID()
} else { } else {
newImage, err := i.Runtime.ImageRuntime().New(getContext(), name, signaturePolicy, "", output, &dockerRegistryOptions, so, false, nil) newImage, err := i.Runtime.ImageRuntime().New(getContext(), name, signaturePolicy, "", output, &dockerRegistryOptions, so, false, nil)
if err != nil { if err != nil {
c <- errors.Wrapf(err, "unable to pull %s", name) c <- errors.Wrapf(err, "unable to pull %s", name)
} else {
imageID = newImage.ID()
} }
imageID = newImage.ID()
} }
c <- nil c <- nil
close(c) close(c)