From 539843bbf887fbed757a234ed13a6f7cdf796107 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 30 Sep 2020 14:55:16 +0200 Subject: [PATCH] app-emulation/containerd: add containerd-runc-shim-v* Add new binaries containerd-runc-shim-v[12] to the torcx tarballs for docker and containerd. The binaries are necessary for kubelet to communicate via custom CRI endpoints. The addition will cause usage of the /usr partition to grow by ~5M. ``` $ ls -l /run/torcx/unpack/docker/bin -rwxr-xr-x. 1 root root 6742592 Sep 30 13:22 containerd-shim -rwxr-xr-x. 1 root root 9095176 Sep 30 13:22 containerd-shim-runc-v1 -rwxr-xr-x. 1 root root 9111752 Sep 30 13:22 containerd-shim-runc-v2 $ ls -l /usr/share/torcx/store/docker\:19.03.torcx.tgz -rw-r--r--. 1 root root 89809888 Sep 30 14:16 /usr/share/torcx/store/docker:19.03.torcx.tgz $ df /usr Filesystem 1K-blocks Used Available Use% Mounted on /dev/mapper/usr 1007760 916024 39720 96% /usr ``` Note, we do not touch other torcx profiles like docker 1.12 or 17.03, to keep the image size as small as possible. --- .../{containerd-1.4.1.ebuild => containerd-1.4.1-r1.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.4.1.ebuild => containerd-1.4.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.1-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 50cd3f9db8..723b6f0ec9 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -58,7 +58,7 @@ src_compile() { } src_install() { - dobin bin/containerd{-shim,-stress,} bin/ctr + dobin bin/containerd{-shim,-shim-runc-v*,-stress,} bin/ctr systemd_newunit "${FILESDIR}/${PN}-1.0.0.service" "${PN}.service" insinto /usr/share/containerd doins "${FILESDIR}/config.toml"