From 3d3744afa17dc4ba891925e15ddf15c8027a4d87 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 16 Nov 2018 10:23:42 -0500 Subject: [PATCH] app-emulation/containerd: disable CRI plugin In containerd 1.1.2 it listens on port 10010 by default. Docker >= 18.06.1 disables the plugin when it launches containerd, but on Container Linux we run containerd directly. --- .../{containerd-1.1.2.ebuild => containerd-1.1.2-r1.ebuild} | 0 .../coreos-overlay/app-emulation/containerd/files/config.toml | 2 ++ .../{docker-18.06.1-r1.ebuild => docker-18.06.1-r2.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-18.06.ebuild | 4 ++-- 5 files changed, 5 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.1.2.ebuild => containerd-1.1.2-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-18.06.1-r1.ebuild => docker-18.06.1-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.2-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml index 2e12fa5f94..2b37f3c106 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml @@ -6,6 +6,8 @@ state = "/run/docker/libcontainerd/containerd" subreaper = true # set containerd's OOM score oom_score = -999 +# CRI plugin listens on a TCP port by default +disabled_plugins = ["cri"] # grpc configuration [grpc] diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 40958e4410..30a024fd5e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -66,7 +66,7 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - =app-emulation/containerd-1.1.2 + =app-emulation/containerd-1.1.2-r1 =app-emulation/docker-runc-1.0.0_rc5_p19[apparmor?,seccomp?] =app-emulation/docker-proxy-0.8.0_p20180709 container-init? ( >=sys-process/tini-0.13.1 ) diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild index e2f930cfb4..9c9d2b9c7c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild @@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-18.06.1-r1 - =app-emulation/containerd-1.1.2 + =app-emulation/docker-18.06.1-r2 + =app-emulation/containerd-1.1.2-r1 =app-emulation/docker-proxy-0.8.0_p20180709 =app-emulation/docker-runc-1.0.0_rc5_p19 =dev-libs/libltdl-2.4.6