Merge pull request #3213 from jcordasc/small-fixes

crosbymichael · Jared Cordasco · commit b9da989b47dd · 2019-04-18T17:11:45.000-05:00
Correct import path and PusherFunc signature (cherry picked from commit 8722ec0) Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
diff --git 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)
 }
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package server`
`19`	`19`	`import (`
`20`	`20`	`"context"`
`21`	`21`
`22`		`- srvconfig "github.com/containerd/containerd/server/config"`
	`22`	`+ srvconfig "github.com/containerd/containerd/services/server/config"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func apply(_ context.Context, _ *srvconfig.Config) error {`