Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit a97094d

Browse files
Random-LiuRandom-Liu
authored
Merge pull request #945 from Random-Liu/cherrypick-#944-release-1.2
Cherrypick #944 release/1.2
2 parents 8506fe8 + 2cd1419 commit a97094d

25 files changed

Lines changed: 824 additions & 365 deletions

File tree

‎pkg/server/image_pull.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ func (c *criService) getResolver(ctx context.Context, ref string, cred func(stri
261261
return nil, imagespec.Descriptor{}, errors.Wrapf(err, "parse registry endpoint %q", e)
262262
}
263263
resolver := docker.NewResolver(docker.ResolverOptions{
264-
Credentials: cred,
265-
Client: http.DefaultClient,
266-
Host: func(string) (string, error) { return u.Host, nil },
264+
Authorizer: docker.NewAuthorizer(http.DefaultClient, cred),
265+
Client: http.DefaultClient,
266+
Host: func(string) (string, error) { return u.Host, nil },
267267
// By default use "https".
268268
PlainHTTP: u.Scheme == "http",
269269
})

‎vendor.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ github.com/blang/semver v3.1.0
33
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
44
github.com/containerd/cgroups 5e610833b72089b37d0e615de9a92dfc043757c2
55
github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23
6-
github.com/containerd/containerd f88d3e5d6dfe9b7d7941ac5241649ad8240b9282
7-
github.com/containerd/continuity 7f53d412b9eb1cbf744c2063185d703a0ee34700
6+
github.com/containerd/containerd 15f19d7a67fa322e6de0ef4c6a1bf9da0f056554
7+
github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
88
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
99
github.com/containerd/go-cni 6d7b509a054a3cb1c35ed1865d4fde2f0cb547cd
1010
github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
@@ -34,7 +34,7 @@ github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f
3434
github.com/json-iterator/go 1.1.5
3535
github.com/matttproud/golang_protobuf_extensions v1.0.0
3636
github.com/Microsoft/go-winio v0.4.10
37-
github.com/Microsoft/hcsshim v0.7.4
37+
github.com/Microsoft/hcsshim v0.7.6
3838
github.com/modern-go/concurrent 1.0.3
3939
github.com/modern-go/reflect2 1.0.1
4040
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7

‎vendor/github.com/Microsoft/hcsshim/hnsendpoint.go‎

Lines changed: 2 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/compression/compression.go‎

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

‎vendor/github.com/containerd/containerd/cmd/ctr/commands/resolver.go‎

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

‎vendor/github.com/containerd/containerd/cmd/ctr/commands/run/run_unix.go‎

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

‎vendor/github.com/containerd/containerd/cmd/ctr/commands/signals.go‎

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

‎vendor/github.com/containerd/containerd/cmd/ctr/commands/tasks/kill.go‎

Lines changed: 15 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/container_opts.go‎

Lines changed: 17 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/images/archive/importer.go‎

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

0 commit comments

Comments
 (0)