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

Merge pull request #1475 from dmcgowan/content-commit-context

Browse Source 
Add context to content commit
This commit is contained in:
Kenfe-Mickaël Laventure
2017-09-06 11:04:31 -07:00
committed by GitHub
parent bf08f7cd08 9613acb2ed
commit e1eeb0e0a2
16 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ctr/content.go
View File

@@ -332,7 +332,7 @@ var (
return err
}
if err := wr.Commit(0, wr.Digest()); err != nil {
if err := wr.Commit(ctx, 0, wr.Digest()); err != nil {
return err
}

2
cmd/ctr/pushobject.go
View File

@@ -70,7 +70,7 @@ var pushObjectCommand = cli.Command{
}
// TODO: Progress reader
if err := content.Copy(cw, content.NewReader(ra), desc.Size, desc.Digest); err != nil {
if err := content.Copy(ctx, cw, content.NewReader(ra), desc.Size, desc.Digest); err != nil {
return err
}