Skip to content

Commit 7c1c123

Browse files
thaJeztahthaJeztah
committed
vendor: github.com/containerd/containerd v1.5.2
full diff: containerd/containerd@19ee068...v1.5.2 Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 989cd6e commit 7c1c123

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1550
-738
lines changed

‎plugin/backend_linux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ func (pm *Manager) Push(ctx context.Context, name string, metaHeader http.Header
421421

422422
// Make sure we can authenticate the request since the auth scope for plugin repos is different than a normal repo.
423423
ctx = docker.WithScope(ctx, scope(ref, true))
424-
if err := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, func(h images.Handler) images.Handler {
424+
if err := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, nil, func(h images.Handler) images.Handler {
425425
return images.Handlers(progressHandler, h)
426426
}); err != nil {
427427
// Try fallback to http.
@@ -433,7 +433,7 @@ func (pm *Manager) Push(ctx context.Context, name string, metaHeader http.Header
433433
pusher, _ := resolver.Pusher(ctx, ref.String())
434434
if pusher != nil {
435435
logrus.WithField("ref", ref).Debug("Re-attmpting push with http-fallback")
436-
err2 := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, func(h images.Handler) images.Handler {
436+
err2 := remotes.PushContent(ctx, pusher, desc, pm.blobStore, nil, nil, func(h images.Handler) images.Handler {
437437
return images.Handlers(progressHandler, h)
438438
})
439439
if err2 == nil {

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ github.com/googleapis/gax-go bd5b16380fd03dc758d11cef74ba
132132
google.golang.org/genproto 3f1135a288c9a07e340ae8ba4cc6c7065a3160e8
133133

134134
# containerd
135-
github.com/containerd/containerd 19ee068f93c91f7b9b2a858457f1af2cabc7bc06 # master (v1.5.0-dev)
135+
github.com/containerd/containerd 36cc874494a56a253cd181a1a685b44b58a2e34a # v1.5.2
136136
github.com/containerd/fifo 650e8a8a179d040123db61f016cb133143e7a581 # v1.0.0
137137
github.com/containerd/continuity bce1c3f9669b6f3e7f6656ee715b0b4d75fa64a6 # v0.1.0
138138
github.com/containerd/cgroups b9de8a2212026c07cec67baf3323f1fc0121e048 # v1.0.1

‎vendor/github.com/Microsoft/hcsshim/pkg/ociwclayer/export.go‎

Lines changed: 88 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Microsoft/hcsshim/pkg/ociwclayer/import.go‎

Lines changed: 148 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/README.md‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/archive/tar.go‎

Lines changed: 23 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/archive/tar_freebsd.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/archive/tar_opts.go‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/archive/tar_opts_windows.go‎

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)