dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-12 22:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3219 from jcordasc/cherrypick-#3213-release-1.2

Browse Source 
[release/1.2 backport] Correct import path and PusherFunc signature
This commit is contained in:
Phil Estes
2019-04-19 09:36:17 -04:00
committed by GitHub
parent 56a655285c b9da989b47
commit 6cdfa4930c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
remotes/resolver.go
View File

@@ -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)
}

2
services/server/server_solaris.go
View File

@@ -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 {