Skip to content

Commit 2fb5de6

Browse files
committed
Update containerd to v1.2.1-rc.0
The previous update used a commit from master. Now that all the fixes are backported to the containerd 1.2 release branch, we can switch back to that branch. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 68cbc37 commit 2fb5de6

File tree

7 files changed

+16
-17
lines changed

7 files changed

+16
-17
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=aa537a67b3a9026c423a63dbaf71e4cc0776b2ad # v1.2.0-13-g8afcade1
7+
CONTAINERD_COMMIT=de1f167ab96338a9f5c2b17347abf84bdf1dd411 # v1.2.1-rc.0
88

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

‎vendor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ github.com/googleapis/gax-go v2.0.0
118118
google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9
119119

120120
# containerd
121-
github.com/containerd/containerd aa537a67b3a9026c423a63dbaf71e4cc0776b2ad # v1.2.0
121+
github.com/containerd/containerd de1f167ab96338a9f5c2b17347abf84bdf1dd411 # v1.2.1-rc.0
122122
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
123123
github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
124124
github.com/containerd/cgroups 5e610833b72089b37d0e615de9a92dfc043757c2

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

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

‎vendor/github.com/containerd/containerd/remotes/docker/resolver.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/runtime/v1/linux/proc/init.go‎

Lines changed: 3 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/runtime/v1/shim/service_linux.go‎

Lines changed: 5 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/vendor.conf‎

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

0 commit comments

Comments
 (0)