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

Merge pull request #4628 from ambarve/lcow_fix_apply_trailing_data

Browse Source 
Read trailing data from tar reader
This commit is contained in:
Wei Fu 2020-10-14 18:02:26 +08:00 committed by GitHub
commit be47c2dac0
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/lcow/lcow.go
View File

@ -21,6 +21,7 @@ package lcow
import ( import (
"context" "context"
"io" "io"
"io/ioutil"
"os" "os"
"path" "path"
"time" "time"
@ -163,6 +164,11 @@ func (s windowsLcowDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mou
} }
outFile.Close() outFile.Close()
// Read any trailing data
if _, err := io.Copy(ioutil.Discard, rc); err != nil {
return emptyDesc, err
}
err = security.GrantVmGroupAccess(layerPath) err = security.GrantVmGroupAccess(layerPath)
if err != nil { if err != nil {
return emptyDesc, errors.Wrapf(err, "failed GrantVmGroupAccess on layer vhd: %v", layerPath) return emptyDesc, errors.Wrapf(err, "failed GrantVmGroupAccess on layer vhd: %v", layerPath)