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

Update task service to use metadata content store

Browse Source 
Address feedback and fix issues

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan
2017-07-06 15:37:25 -07:00
parent b6d58f63a8
commit 4322664b88
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/diff/service.go
View File

@@ -3,6 +3,7 @@ package diff
import (
diffapi "github.com/containerd/containerd/api/services/diff/v1"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/plugin"
"golang.org/x/net/context"
@@ -45,7 +46,7 @@ func (s *service) Apply(ctx context.Context, er *diffapi.ApplyRequest) (*diffapi
ocidesc, err := s.diff.Apply(ctx, desc, mounts)
if err != nil {
return nil, err
return nil, errdefs.ToGRPC(err)
}
return &diffapi.ApplyResponse{
@@ -60,7 +61,7 @@ func (s *service) Diff(ctx context.Context, dr *diffapi.DiffRequest) (*diffapi.D
ocidesc, err := s.diff.DiffMounts(ctx, aMounts, bMounts, dr.MediaType, dr.Ref)
if err != nil {
return nil, err
return nil, errdefs.ToGRPC(err)
}
return &diffapi.DiffResponse{