github.com/kaisenlinux/docker.io@v0.0.0-20230510090727-ea55db55fac7/debian/patches/engine-build-against-containerd-v1.5.2.patch (about)

     1  From: Sebastiaan van Stijn <github@gone.nl>
     2  Date: Fri, 4 Jun 2021 16:32:37 +0200
     3  Subject: vendor: github.com/containerd/containerd v1.5.2
     4  
     5  full diff: https://github.com/containerd/containerd/compare/19ee068f93c91f7b9b2a858457f1af2cabc7bc06...v1.5.2
     6  
     7  Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
     8  Origin: upstream, https://github.com/moby/moby/commit/7c1c1235
     9  ---
    10   plugin/backend_linux.go | 4 ++--
    11   1 file changed, 2 insertions(+), 2 deletions(-)
    12  
    13  Index: docker/engine/plugin/backend_linux.go
    14  ===================================================================
    15  --- docker.orig/engine/plugin/backend_linux.go
    16  +++ docker/engine/plugin/backend_linux.go
    17  @@ -420,7 +420,7 @@ func (pm *Manager) Push(ctx context.Cont
    18   
    19   	// Make sure we can authenticate the request since the auth scope for plugin repos is different than a normal repo.
    20   	ctx = docker.WithScope(ctx, scope(ref, true))
    21  -	if err := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, func(h images.Handler) images.Handler {
    22  +	if err := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, nil, func(h images.Handler) images.Handler {
    23   		return images.Handlers(progressHandler, h)
    24   	}); err != nil {
    25   		// Try fallback to http.
    26  @@ -432,7 +432,7 @@ func (pm *Manager) Push(ctx context.Cont
    27   			pusher, _ := resolver.Pusher(ctx, ref.String())
    28   			if pusher != nil {
    29   				logrus.WithField("ref", ref).Debug("Re-attmpting push with http-fallback")
    30  -				err2 := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, func(h images.Handler) images.Handler {
    31  +				err2 := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, nil, func(h images.Handler) images.Handler {
    32   					return images.Handlers(progressHandler, h)
    33   				})
    34   				if err2 == nil {