1 files changed, 8 insertions, 0 deletions

diff --git a/recipes-extended/images/container-image-host.bb b/recipes-extended/images/container-image-host.bb
index 454fcd45..723f0cf5 100644
--- a/recipes-extended/images/container-image-host.bb
+++ b/recipes-extended/images/container-image-host.bb
@@ -84,6 +84,14 @@ REQUIRED_DISTRO_FEATURES:append = " ${@bb.utils.contains('VIRTUAL-RUNTIME_contai
 # of the host name to make it unique
 IMAGE_FEATURES[validitems] += "virt-unique-hostname"
 IMAGE_FEATURES[validitems] += "container-tools"
+IMAGE_FEATURES[validitems] += "container-registry"
+
+# Container registry configuration packages (opt-in via IMAGE_FEATURES += "container-registry")
+# Requires CONTAINER_REGISTRY_URL and/or DOCKER_REGISTRY_INSECURE to be set
+FEATURE_PACKAGES_container-registry = "\
+    ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine', 'docker docker-moby', 'docker-registry-config', '', d)} \
+    ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine', 'podman containerd cri-o', 'container-oci-registry-config', '', d)} \
+"
 
 IMAGE_FEATURES += "ssh-server-openssh"
 IMAGE_FEATURES += "package-management"