diff --git a/kernel/configs/fragments/common/fs.conf b/kernel/configs/fragments/common/fs.conf index 6bcb62ea89..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 @@ -41,3 +44,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 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