diff options
4 files changed, 31 insertions, 3 deletions
diff --git a/meta-unit-core/dynamic-layers/unit-virtualization-layer/recipes-unit/images/core-image-unit.bbappend b/meta-unit-core/dynamic-layers/unit-virtualization-layer/recipes-unit/images/core-image-unit.bbappend index eebbff6..947ccf4 100644 --- a/meta-unit-core/dynamic-layers/unit-virtualization-layer/recipes-unit/images/core-image-unit.bbappend +++ b/meta-unit-core/dynamic-layers/unit-virtualization-layer/recipes-unit/images/core-image-unit.bbappend @@ -3,9 +3,10 @@ inherit fix-prometheus-conf-dir-ownership IMAGE_INSTALL:append = " packagegroup-unit-containers" -# The only kube in here uses gRPC curl container which doesn't support armv7 -IMAGE_INSTALL:append:raspberrypi3-64 = " packagegroup-unit-kubes" -IMAGE_INSTALL:append:radxa-zero-3e = " packagegroup-unit-kubes" +IMAGE_INSTALL:append = " packagegroup-unit-containers-conf" + +IMAGE_INSTALL:append = " packagegroup-unit-kubes" IMAGE_INSTALL:append = " packagegroup-unit-quadlets" + IMAGE_INSTALL:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'observability', 'packagegroup-unit-observability-quadlets', '', d)}" diff --git a/meta-unit-virtualization/recipes-containers/packagegroups/packagegroup-unit-containers-conf.bb b/meta-unit-virtualization/recipes-containers/packagegroups/packagegroup-unit-containers-conf.bb new file mode 100644 index 0000000..0a032d8 --- /dev/null +++ b/meta-unit-virtualization/recipes-containers/packagegroups/packagegroup-unit-containers-conf.bb @@ -0,0 +1,5 @@ +SUMMARY = "Unit container configuration" + +inherit packagegroup + +RDEPENDS:${PN}:append = " storage-conf" diff --git a/meta-unit-virtualization/recipes-containers/storage-conf/files/storage.conf b/meta-unit-virtualization/recipes-containers/storage-conf/files/storage.conf new file mode 100644 index 0000000..0b1afb0 --- /dev/null +++ b/meta-unit-virtualization/recipes-containers/storage-conf/files/storage.conf @@ -0,0 +1,5 @@ +[storage] +driver = "overlay" + +[storage.options.overlay] +mount_program = "/usr/bin/fuse-overlayfs" diff --git a/meta-unit-virtualization/recipes-containers/storage-conf/storage-conf.bb b/meta-unit-virtualization/recipes-containers/storage-conf/storage-conf.bb new file mode 100644 index 0000000..2b91e05 --- /dev/null +++ b/meta-unit-virtualization/recipes-containers/storage-conf/storage-conf.bb @@ -0,0 +1,17 @@ +SUMMARY = "Container storage configuration for rootless containers" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${UNIT_VIRTUALIZATION_LAYERDIR}/LICENSE;md5=a77c12e0c0e8a14cebb1494195720ccc" + +SRC_URI = "file://storage.conf" + +RDEPENDS:${PN} = "add-user-svc" + +ROOTLESS_USER_NAME ?= "svc" + +S = "${UNPACKDIR}" + +do_install() { + install -D -m 0644 ${S}/storage.conf ${D}/home/${ROOTLESS_USER_NAME}/.config/containers/storage.conf +} + +FILES:${PN} = "/home/${ROOTLESS_USER_NAME}/.config/containers/storage.conf" |