commit: e8a44e967cc1805daaaa87b3f0c4c8ab433f261e Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Mon Mar 8 20:28:37 2021 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Mon Mar 8 20:47:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a44e96
app-emulation/docker: adjust dependencies for 20.10.x per upstream - drop the dependency on runc since this is pulled in by containerd - set a lower limit for the dependency oncontainerd but do not pin it to a specific version. For more information, see the below upstream issue. https://github.com/moby/moby/issues/42117 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> ...ker-20.10.4.ebuild => docker-20.10.3-r2.ebuild} | 25 +++++++++++++++++++--- app-emulation/docker/docker-20.10.4.ebuild | 5 ++--- app-emulation/docker/docker-20.10.5.ebuild | 5 ++--- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app-emulation/docker/docker-20.10.4.ebuild b/app-emulation/docker/docker-20.10.3-r2.ebuild similarity index 93% copy from app-emulation/docker/docker-20.10.4.ebuild copy to app-emulation/docker/docker-20.10.3-r2.ebuild index bba2fa9a7eb..3d9e91ee00e 100644 --- a/app-emulation/docker/docker-20.10.4.ebuild +++ b/app-emulation/docker/docker-20.10.3-r2.ebuild @@ -28,7 +28,7 @@ DEPEND=" # https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies # https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies # https://github.com/moby/moby/tree/master//hack/dockerfile/install -# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, +# make sure containerd, docker-proxy and tini pinned to exact versions from ^, # for appropriate branchch/version of course RDEPEND=" ${DEPEND} @@ -38,7 +38,6 @@ RDEPEND=" >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?] - ~app-emulation/runc-1.0.0_rc93[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20201215 cli? ( app-emulation/docker-cli ) container-init? ( >=sys-process/tini-0.19.0[static] ) @@ -59,7 +58,6 @@ S="${WORKDIR}/${P}/src/${EGO_PN}" CONFIG_CHECK=" ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG - ~CGROUP_NET_PRIO ~KEYS ~VETH ~BRIDGE ~BRIDGE_NETFILTER ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK @@ -101,6 +99,27 @@ ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" pkg_setup() { + if kernel_is lt 3 10; then + ewarn "" + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." + ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"; + fi + + if kernel_is le 3 18; then + CONFIG_CHECK+=" + ~RESOURCE_COUNTERS + " + fi + + if kernel_is le 3 13; then + CONFIG_CHECK+=" + ~NETPRIO_CGROUP + " + else + CONFIG_CHECK+=" + ~CGROUP_NET_PRIO + " + fi if kernel_is lt 4 5; then CONFIG_CHECK+=" diff --git a/app-emulation/docker/docker-20.10.4.ebuild b/app-emulation/docker/docker-20.10.4.ebuild index bba2fa9a7eb..ee31e108512 100644 --- a/app-emulation/docker/docker-20.10.4.ebuild +++ b/app-emulation/docker/docker-20.10.4.ebuild @@ -28,7 +28,7 @@ DEPEND=" # https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies # https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies # https://github.com/moby/moby/tree/master//hack/dockerfile/install -# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, +# make sure docker-proxy is pinned to exact version from ^, # for appropriate branchch/version of course RDEPEND=" ${DEPEND} @@ -37,8 +37,7 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - ~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?] - ~app-emulation/runc-1.0.0_rc93[apparmor?,seccomp?] + >=app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20201215 cli? ( app-emulation/docker-cli ) container-init? ( >=sys-process/tini-0.19.0[static] ) diff --git a/app-emulation/docker/docker-20.10.5.ebuild b/app-emulation/docker/docker-20.10.5.ebuild index 2c037df1422..b444365e4a9 100644 --- a/app-emulation/docker/docker-20.10.5.ebuild +++ b/app-emulation/docker/docker-20.10.5.ebuild @@ -28,7 +28,7 @@ DEPEND=" # https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies # https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies # https://github.com/moby/moby/tree/master//hack/dockerfile/install -# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, +# make sure docker-proxy is pinned to exact version from ^, # for appropriate branchch/version of course RDEPEND=" ${DEPEND} @@ -37,8 +37,7 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - ~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?] - ~app-emulation/runc-1.0.0_rc93[apparmor?,seccomp?] + >=app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20201215 cli? ( app-emulation/docker-cli ) container-init? ( >=sys-process/tini-0.19.0[static] )
