mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-06-01 01:00:15 +00:00
arm-autonomy: Add minimal docker runtime in xenguest images
This patch introduces the 'docker' DISTRO_FEATURE do control whether or not to have a minimal docker runtime installed in xenguest images. A new packagegroup and kernel feature were introduced to ensure the minimal kernel config is applied as well as the packages to be installed in the image. Change-Id: Id973ca2421c43d5b0978c6f7311e1d0b4db5edca Issue-Id: SCM-1533 Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
@@ -9,3 +9,7 @@ IMAGE_FSTYPES += "xenguest"
|
|||||||
|
|
||||||
# xenguest kernel extension to handle initramfs
|
# xenguest kernel extension to handle initramfs
|
||||||
KERNEL_CLASSES += "kernel-xenguest"
|
KERNEL_CLASSES += "kernel-xenguest"
|
||||||
|
|
||||||
|
IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'docker', \
|
||||||
|
' packagegroup-docker-runtime-minimal', \
|
||||||
|
'', d)}"
|
||||||
|
|||||||
+19
@@ -0,0 +1,19 @@
|
|||||||
|
# SPDX-License-Identifier: MIT
|
||||||
|
#
|
||||||
|
# Copyright (c) 2020 Arm Limited
|
||||||
|
#
|
||||||
|
|
||||||
|
SUMMARY = "Docker runtime minimal requirements"
|
||||||
|
DESCRIPTION = "The minimal set of packages required for running Docker"
|
||||||
|
|
||||||
|
inherit packagegroup
|
||||||
|
|
||||||
|
RDEPENDS_${PN} = "\
|
||||||
|
docker-ce \
|
||||||
|
docker-ce-contrib \
|
||||||
|
kernel-module-xt-nat \
|
||||||
|
kernel-module-xt-masquerade \
|
||||||
|
kernel-module-xt-addrtype \
|
||||||
|
kernel-module-xt-conntrack \
|
||||||
|
kernel-module-xt-ipvs \
|
||||||
|
"
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
CONFIG_NAMESPACES=y
|
||||||
|
CONFIG_NET_NS=y
|
||||||
|
CONFIG_PID_NS=y
|
||||||
|
CONFIG_IPC_NS=y
|
||||||
|
CONFIG_UTS_NS=y
|
||||||
|
CONFIG_CGROUPS=y
|
||||||
|
CONFIG_CGROUP_CPUACCT=y
|
||||||
|
CONFIG_CGROUP_DEVICE=y
|
||||||
|
CONFIG_CGROUP_FREEZER=y
|
||||||
|
CONFIG_CGROUP_SCHED=y
|
||||||
|
CONFIG_CPUSETS=y
|
||||||
|
CONFIG_MEMCG=y
|
||||||
|
CONFIG_KEYS=y
|
||||||
|
CONFIG_POSIX_MQUEUE=y
|
||||||
|
CONFIG_VETH=y
|
||||||
|
CONFIG_IPV6=y
|
||||||
|
CONFIG_BRIDGE=y
|
||||||
|
CONFIG_BRIDGE_NETFILTER=y
|
||||||
|
CONFIG_IP_NF_FILTER=m
|
||||||
|
CONFIG_IP_NF_NAT=m
|
||||||
|
CONFIG_NF_NAT=m
|
||||||
|
CONFIG_IP_NF_TARGET_MASQUERADE=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
|
||||||
|
CONFIG_IP_VS=y
|
||||||
|
CONFIG_NETFILTER_XT_MATCH_IPVS=m
|
||||||
+5
@@ -0,0 +1,5 @@
|
|||||||
|
define KFEATURE_DESCRIPTION "Minimal Kernel configs for Docker runtime"
|
||||||
|
|
||||||
|
include features/netfilter/netfilter.scc
|
||||||
|
|
||||||
|
kconf non-hardware docker-minimal.cfg
|
||||||
@@ -24,3 +24,6 @@ KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \
|
|||||||
COMPATIBLE_MACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
|
COMPATIBLE_MACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
|
||||||
KMACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
|
KMACHINE_arm64-autonomy-guest = "arm64-autonomy-guest"
|
||||||
|
|
||||||
|
# Add Minimal Kernel Configs for Docker runtime
|
||||||
|
KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \
|
||||||
|
'docker', 'features/arm-autonomy/docker-minimal.scc', '', d)}"
|
||||||
|
|||||||
Reference in New Issue
Block a user