summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2017-02-10 10:44:27 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-02-15 14:58:37 -0500
commitdebdd70e982ff432672e4b1e5cce1a7ea0492655 (patch)
treeb04a38c8448552a32d482ebb25a8e2527a58ed79
parentb18acd8bc403dc8781e3a25bb534e14ba0c38fda (diff)
downloadmeta-virtualization-debdd70e982ff432672e4b1e5cce1a7ea0492655.tar.gz
containerd: uprev to version required by docker 1.13.0
Docker defines required dependency versions in its vendor.conf file. These can also be validated by running 'docker info' on the running system. In order to avoid issues, such as the current one where docker can't run containers, we need to ensure we match these versions. Uprev containerd to the version defined in docker's vendor.conf file. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/containerd/containerd_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
index 5b94dde4..67011a35 100644
--- a/recipes-containers/containerd/containerd_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -4,9 +4,9 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
4 containerd leverages runC's advanced features such as seccomp and user namespace \ 4 containerd leverages runC's advanced features such as seccomp and user namespace \
5 support as well as checkpoint and restore for cloning and live migration of containers." 5 support as well as checkpoint and restore for cloning and live migration of containers."
6 6
7SRCREV = "0ac3cd1be170d180b2baed755e8f0da547ceb267" 7SRCREV = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e"
8SRC_URI = "\ 8SRC_URI = "\
9 git://github.com/docker/containerd.git;nobranch=1 \ 9 git://github.com/docker/containerd.git;branch=docker-1.13.x \
10 " 10 "
11 11
12# Apache-2.0 for containerd 12# Apache-2.0 for containerd
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.code;md5=aadc30f9c14d876ded7bedc0afd2d3d7"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18CONTAINERD_VERSION = "0.2.2" 18CONTAINERD_VERSION = "0.2.3"
19PV = "${CONTAINERD_VERSION}+git${SRCREV}" 19PV = "${CONTAINERD_VERSION}+git${SRCREV}"
20 20
21DEPENDS = "go-cross-${TARGET_ARCH} \ 21DEPENDS = "go-cross-${TARGET_ARCH} \