Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 92806c1

Browse files
authored
Merge pull request #40453 from thaJeztah/19.03_bump_containerd
[19.03] update containerd 1.12.12, runc v1.0.0-rc10 Upstream-commit: 5f6d6f3f220355e6db7167ba82bc2def47a013d0 Component: engine
2 parents e88a6af + 6e493ff commit 92806c1

15 files changed

Lines changed: 394 additions & 21 deletions

File tree

components/engine/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=f772c10a585ced6be8f86e8c58c2b998412dd963 # v1.2.11
7+
CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021 # v1.2.12
88

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

components/engine/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=d736ef14f0288d6993a1845745d6756cfc9ddd5a # v1.0.0-rc9
7+
RUNC_COMMIT=dc9208a3303feef5b3839f4323d9beb36df0a9dd # v1.0.0-rc10
88

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

components/engine/vendor.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ google.golang.org/grpc 6eaf6f47437a6b4e2153a190160e
8080
# the containerd project first, and update both after that is merged.
8181
# This commit does not need to match RUNC_COMMIT as it is used for helper
8282
# packages but should be newer or equal.
83-
github.com/opencontainers/runc 3e425f80a8c931f88e6d94a8c831b9d5aa481657 # v1.0.0-rc8-92-g84373aaa
83+
github.com/opencontainers/runc dc9208a3303feef5b3839f4323d9beb36df0a9dd # v1.0.0-rc10
8484
github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
8585
github.com/opencontainers/image-spec d60099175f88c47cd379c4738d158884749ed235 # v1.0.1
8686
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
@@ -161,6 +161,6 @@ github.com/morikuni/aec 39771216ff4c63d11f5e604076f9
161161
# metrics
162162
github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
163163

164-
github.com/opencontainers/selinux 3a1f366feb7aecbf7a0e71ac4cea88b31597de9e # v1.2.2
164+
github.com/opencontainers/selinux 5215b1806f52b1fcc2070a8826c542c9d33cd3cf
165165

166166
# DO NOT EDIT BELOW THIS LINE -------- reserved for downstream projects --------

components/engine/vendor/github.com/opencontainers/runc/README.md

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

components/engine/vendor/github.com/opencontainers/runc/libcontainer/apparmor/apparmor.go

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

components/engine/vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.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.

components/engine/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go

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

components/engine/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go

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

components/engine/vendor/github.com/opencontainers/runc/libcontainer/utils/cmsg.go

Lines changed: 93 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)