mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-19 21:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/containerd: disable CRI plugin

Browse Source 
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.
This commit is contained in:
Benjamin Gilbert 2018-11-16 10:23:42 -05:00
parent 8e40b7fa6e
commit 3d3744afa1
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.2.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.1.2-r1.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/config.toml vendored
View File

@ -6,6 +6,8 @@ state = "/run/docker/libcontainerd/containerd"
subreaper = true subreaper = true
# set containerd's OOM score # set containerd's OOM score
oom_score = -999 oom_score = -999
# CRI plugin listens on a TCP port by default
disabled_plugins = ["cri"]
# grpc configuration # grpc configuration
[grpc] [grpc]

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.06.1-r2.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -66,7 +66,7 @@ RDEPEND="
>=dev-vcs/git-1.7 >=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9 >=app-arch/xz-utils-4.9
dev-libs/libltdl 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-runc-1.0.0_rc5_p19[apparmor?,seccomp?]
=app-emulation/docker-proxy-0.8.0_p20180709 =app-emulation/docker-proxy-0.8.0_p20180709
container-init? ( >=sys-process/tini-0.13.1 ) container-init? ( >=sys-process/tini-0.13.1 )

4
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-18.06.ebuild vendored
View File

@ -11,8 +11,8 @@ KEYWORDS="amd64 arm64"
# Explicitly list all packages that will be built into the image. # Explicitly list all packages that will be built into the image.
RDEPEND=" RDEPEND="
=app-emulation/docker-18.06.1-r1 =app-emulation/docker-18.06.1-r2
=app-emulation/containerd-1.1.2 =app-emulation/containerd-1.1.2-r1
=app-emulation/docker-proxy-0.8.0_p20180709 =app-emulation/docker-proxy-0.8.0_p20180709
=app-emulation/docker-runc-1.0.0_rc5_p19 =app-emulation/docker-runc-1.0.0_rc5_p19
=dev-libs/libltdl-2.4.6 =dev-libs/libltdl-2.4.6