From b3cc1f4e694a584c69eb18bb804c0ecbece1d66c Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Mon, 28 Oct 2019 20:50:18 -0700 Subject: [PATCH] docker-ce: define cgroup in makefile --- utils/docker-ce/Config.in | 5 +---- utils/docker-ce/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/utils/docker-ce/Config.in b/utils/docker-ce/Config.in index 7e29e774..8d00a2d9 100644 --- a/utils/docker-ce/Config.in +++ b/utils/docker-ce/Config.in @@ -1,12 +1,9 @@ menu "Kernel features for Docker" - depends on PACKAGE_docke-ce + depends on PACKAGE_docker-ce config DOCKER_KERNEL_OPTIONS bool "Enable Basic kernel support for Docker" default y - select KERNEL_CGROUPS - select KERNEL_CGROUP_CPUACCT - select KERNEL_CGROUP_SCHED select KERNEL_NAMESPACES select KERNEL_CPUSETS select KERNEL_MEMCG diff --git a/utils/docker-ce/Makefile b/utils/docker-ce/Makefile index ebfe81bd..98695bf8 100644 --- a/utils/docker-ce/Makefile +++ b/utils/docker-ce/Makefile @@ -45,9 +45,10 @@ define Package/docker-ce TITLE:=Docker Community Edition URL:=https://www.docker.com/ DEPENDS:=$(GO_ARCH_DEPENDS) @HAS_FPU @TARGET_x86_64||arm||aarch64 +btrfs-progs +ca-certificates +cgroupfs-mount +containerd +libdevmapper +libnetwork +tini \ - +DOCKER_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-conntrack-netlink +kmod-nf-ipvs +kmod-veth + +DOCKER_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-conntrack-netlink +kmod-nf-ipvs +kmod-veth \ + +@KERNEL_CGROUPS +@KERNEL_CGROUP_CPUACCT +@KERNEL_CGROUP_SCHED USERID:=docker:docker - MENU:=1 + endef define Package/docker-ce/description