github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #3570 from dmcgowan/fix-apply-trailing-data

Browse Source 
Read trailing data on apply
This commit is contained in:
Phil Estes 2019-08-21 13:07:49 -07:00 committed by GitHub
commit bd46ea5191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff/apply/apply.go
View File

@ -19,6 +19,7 @@ package apply
import ( import (
"context" "context"
"io" "io"
"io/ioutil"
"time" "time"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
@ -97,6 +98,11 @@ func (s *fsApplier) Apply(ctx context.Context, desc ocispec.Descriptor, mounts [
return emptyDesc, err return emptyDesc, err
} }
// Read any trailing data
if _, err := io.Copy(ioutil.Discard, rc); err != nil {
return emptyDesc, err
}
for _, p := range processors { for _, p := range processors {
if ep, ok := p.(interface { if ep, ok := p.(interface {
Err() error Err() error