summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-04-02 00:46:54 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-04-02 00:46:54 -0400
commitd7d310ae41133072428c69621ac7146d9f6d22f1 (patch)
tree46d24a19bf437e3d9640babf9bb4ee6186c14538
parent935e3d969ef1c0ce2f2a2719c31285be6114c8f9 (diff)
downloadmeta-virtualization-d7d310ae41133072428c69621ac7146d9f6d22f1.tar.gz
meta-virt: prefer containerd-opencontainers
docker has moved to a non-forked version of containerd, so we set our preference to opencontainers. The containerd-docker is too old to properly work with modern docker builds, but we keep it around for reference and compatibility. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--conf/layer.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index f71c117d..f75ed368 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -21,7 +21,7 @@ LAYERDEPENDS_virtualization-layer = "core networking-layer"
21require conf/distro/include/virt_security_flags.inc 21require conf/distro/include/virt_security_flags.inc
22 22
23PREFERRED_PROVIDER_virtual/runc ?= "runc-docker" 23PREFERRED_PROVIDER_virtual/runc ?= "runc-docker"
24PREFERRED_PROVIDER_virtual/containerd ?= "containerd-docker" 24PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
25 25
26# Sanity check for meta-virtualization layer. 26# Sanity check for meta-virtualization layer.
27# Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check. 27# Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.