From a7af3c13a520bc3a717bf54915701fcd42ef71eb Mon Sep 17 00:00:00 2001 From: Jared Cordasco Date: Thu, 11 Apr 2019 23:07:46 -0500 Subject: [PATCH 1/2] Correct import path in services/server package Signed-off-by: Jared Cordasco --- services/server/server_solaris.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/server/server_solaris.go b/services/server/server_solaris.go index f3182211f..35a637021 100644 --- a/services/server/server_solaris.go +++ b/services/server/server_solaris.go @@ -19,7 +19,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/server/config" + srvconfig "github.com/containerd/containerd/services/server/config" ) func apply(_ context.Context, _ *srvconfig.Config) error { From fc167f9578079e854ffb6f00fb7cac636473df69 Mon Sep 17 00:00:00 2001 From: Jared Cordasco Date: Thu, 11 Apr 2019 23:13:20 -0500 Subject: [PATCH 2/2] Correct PusherFunc helper to match Pusher intf Signed-off-by: Jared Cordasco --- remotes/resolver.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/remotes/resolver.go b/remotes/resolver.go index a9b2b78aa..914d351fd 100644 --- a/remotes/resolver.go +++ b/remotes/resolver.go @@ -72,9 +72,9 @@ func (fn FetcherFunc) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.Re // PusherFunc allows package users to implement a Pusher with just a // function. -type PusherFunc func(ctx context.Context, desc ocispec.Descriptor, r io.Reader) error +type PusherFunc func(ctx context.Context, desc ocispec.Descriptor) (content.Writer, error) // Push content -func (fn PusherFunc) Push(ctx context.Context, desc ocispec.Descriptor, r io.Reader) error { - return fn(ctx, desc, r) +func (fn PusherFunc) Push(ctx context.Context, desc ocispec.Descriptor) (content.Writer, error) { + return fn(ctx, desc) }