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

api/types: consolidate types package

Browse Source 
To simplify use of types, we have consolidate the packages for the mount
and descriptor protobuf types into a single Go package. We also drop the
versioning from the type packages, as these types will remain the same
between versions.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-06-22 19:51:26 -07:00
parent 40f2627ce1
commit 12c0daa9c9
26 changed files with 496 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/tasks/service.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/boltdb/bolt"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
api "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/descriptor"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/archive"
"github.com/containerd/containerd/containers"
@@ -444,14 +444,14 @@ func (s *Service) Checkpoint(ctx context.Context, r *api.CheckpointTaskRequest)
return nil, err
}
return &api.CheckpointTaskResponse{
Descriptors: []*descriptor.Descriptor{
Descriptors: []*types.Descriptor{
cp,
specD,
},
}, nil
}
func (s *Service) writeContent(ctx context.Context, mediaType, ref string, r io.Reader) (*descriptor.Descriptor, error) {
func (s *Service) writeContent(ctx context.Context, mediaType, ref string, r io.Reader) (*types.Descriptor, error) {
writer, err := s.store.Writer(ctx, ref, 0, "")
if err != nil {
return nil, err
@@ -464,7 +464,7 @@ func (s *Service) writeContent(ctx context.Context, mediaType, ref string, r io.
if err := writer.Commit(0, ""); err != nil {
return nil, err
}
return &descriptor.Descriptor{
return &types.Descriptor{
MediaType: mediaType,
Digest: writer.Digest(),
Size_: size,