opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 12:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3716 from baude/varlinkfixes2

Browse Source 
various fixes for varlink endpoints
This commit is contained in:
OpenShift Merge Robot
2019-08-05 16:58:43 +02:00
committed by GitHub
parent 1c6d7eb954 c34e74755a
commit 3bffe77f82
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/varlinkapi/images.go
View File

@ -198,6 +198,8 @@ func (i *LibpodAPI) BuildImage(call iopodman.VarlinkCall, config iopodman.BuildI
if call.WantsMore() { if call.WantsMore() {
call.Continues = true call.Continues = true
} else {
return call.ReplyErrorOccurred("endpoint requires a more connection")
} }
var newPathDockerFiles []string var newPathDockerFiles []string
@ -642,6 +644,7 @@ func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string) error {
defer close(c) defer close(c)
go func() { go func() {
var foundError bool
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 {
@ -649,6 +652,7 @@ func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string) error {
} }
newImage, err := i.Runtime.ImageRuntime().LoadFromArchiveReference(getContext(), srcRef, "", output) newImage, err := i.Runtime.ImageRuntime().LoadFromArchiveReference(getContext(), srcRef, "", output)
if err != nil { if err != nil {
foundError = true
c <- errors.Wrapf(err, "error pulling image from %q", name) c <- errors.Wrapf(err, "error pulling image from %q", name)
} else { } else {
imageID = newImage[0].ID() imageID = newImage[0].ID()
@ -656,12 +660,15 @@ func (i *LibpodAPI) PullImage(call iopodman.VarlinkCall, name string) error {
} else { } else {
newImage, err := i.Runtime.ImageRuntime().New(getContext(), name, "", "", output, &dockerRegistryOptions, so, false, nil) newImage, err := i.Runtime.ImageRuntime().New(getContext(), name, "", "", output, &dockerRegistryOptions, so, false, nil)
if err != nil { if err != nil {
foundError = true
c <- errors.Wrapf(err, "unable to pull %s", name) c <- errors.Wrapf(err, "unable to pull %s", name)
} else { } else {
imageID = newImage.ID() imageID = newImage.ID()
} }
} }
if !foundError {
c <- nil c <- nil
}
}() }()
var log []string var log []string