From 797dd5c16dae0a0aff75451421d72e27309a2bcc Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Thu, 12 Sep 2019 07:20:13 -0700 Subject: [PATCH 1/2] config: re-add support for docker-in-docker Overlay and veth support wasn't included when migrating to fragment based configs. Re-add to fix DinD use case. Fixes: #715 Signed-off-by: Eric Ernst --- kernel/configs/fragments/common/fs.conf | 5 +++++ kernel/configs/fragments/common/network.conf | 2 ++ 2 files changed, 7 insertions(+) diff --git a/kernel/configs/fragments/common/fs.conf b/kernel/configs/fragments/common/fs.conf index 6bcb62ea89..936e86bff3 100644 --- a/kernel/configs/fragments/common/fs.conf +++ b/kernel/configs/fragments/common/fs.conf @@ -41,3 +41,8 @@ CONFIG_FHANDLE=y # We should support Async IO. CONFIG_AIO=y + +# Docker in Docker support requires overlay +CONFIG_OVERLAY_FS=y +CONFIG_OVERLAY_FS_INDEX=y +CONFIG_OVERLAY_FS_REDIRECT_DIR=y diff --git a/kernel/configs/fragments/common/network.conf b/kernel/configs/fragments/common/network.conf index bf06b92453..bffdf80695 100644 --- a/kernel/configs/fragments/common/network.conf +++ b/kernel/configs/fragments/common/network.conf @@ -74,4 +74,6 @@ CONFIG_HAVE_EBPF_JIT=y # We v.likely need some intel chip support CONFIG_NET_VENDOR_INTEL=y +# Add VETH support (necessary for running Docker in the guest) +CONFIG_VETH=y # We quite likely need to add others for passthrough and maybe SRIOV support From 8ab7c3dc77ac4adef6291f8d23582923d2f4106b Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Thu, 12 Sep 2019 14:15:37 -0700 Subject: [PATCH 2/2] config: blk-dev-throttling - blk-dev-throttling is recommended for Docker (in docker use case). Enabling. Signed-off-by: Eric Ernst --- kernel/configs/fragments/common/fs.conf | 3 +++ kernel/kata_config_version | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/configs/fragments/common/fs.conf b/kernel/configs/fragments/common/fs.conf index 936e86bff3..28d9019ee2 100644 --- a/kernel/configs/fragments/common/fs.conf +++ b/kernel/configs/fragments/common/fs.conf @@ -2,6 +2,9 @@ CONFIG_BLK_DEV_INITRD=y +# Recommended for Docker +CONFIG_BLK_DEV_THROTTLING=y + # Required for hotplug block devices into Kata, using SCSI CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_BSG=y diff --git a/kernel/kata_config_version b/kernel/kata_config_version index e373ee695f..82cced27d7 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -50 +51