8000 Merge pull request #39016 from tao12345666333/bump-containerd-v1.2.6 · moby/moby@9d850cb · GitHub
[go: up one dir, main page]
Skip to content

Commit 9d850cb

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #39016 from tao12345666333/bump-containerd-v1.2.6
Bump containerd v1.2.6, runc 029124da7af7360afa781a0234d1b083550f797c
2 parents 2e1cfbc + c28171c commit 9d850cb

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

‎hack/dockerfile/install/containerd.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# containerd is also pinned in vendor.conf. When updating the binary
55
# version you may also need to update the vendor version to pick up bug
66
# fixes or new APIs.
7-
CONTAINERD_COMMIT=bb71b10fd8f58240ca47fbb579b9d1028eea7c84 # v1.2.5
7+
CONTAINERD_COMMIT=894b81a4b802e4eb2a91d1ce216b8817763c29fb # v1.2.6
88

99
install_containerd() {
1010
echo "Install containerd version $CONTAINERD_COMMIT"

‎hack/dockerfile/install/runc.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The version of runc should match the version that is used by the containerd
55
# version that is used. If you need to update runc, open a pull request in
66
# the containerd project first, and update both after that is merged.
7-
RUNC_COMMIT=2b18fe1d885ee5083ef9f0838fee39b62d653e30
7+
RUNC_COMMIT=029124da7af7360afa781a0234d1b083550f797c # v1.0.0-rc7-6-g029124da
88

99
install_runc() {
1010
# If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ google.golang.org/grpc 7a6a684ca69eb4cae85ad0a484f2e531598c047b # v1.12.2
8181
# the containerd project first, and update both after that is merged.
8282
# This commit does not need to match RUNC_COMMIT as it is used for helper
8383
# packages but should be newer or equal.
84-
github.com/opencontainers/runc 2b18fe1d885ee5083ef9f0838fee39b62d653e30
84+
github.com/opencontainers/runc 029124da7af7360afa781a0234d1b083550f797c # v1.0.0-rc7-6-g029124da
8585
github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
8686
github.com/opencontainers/image-spec v1.0.1
8787
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0

‎vendor/github.com/opencontainers/runc/libcontainer/nsenter/cloned_binary.c‎

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

‎vendor/github.com/opencontainers/runc/vendor.conf‎

Lines changed: 1 addition & 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)
0