From debdd70e982ff432672e4b1e5cce1a7ea0492655 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Fri, 10 Feb 2017 10:44:27 -0500 Subject: 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 Signed-off-by: Bruce Ashfield --- recipes-containers/containerd/containerd_git.bb | 6 +++--- 1 file 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 containerd leverages runC's advanced features such as seccomp and user namespace \ support as well as checkpoint and restore for cloning and live migration of containers." -SRCREV = "0ac3cd1be170d180b2baed755e8f0da547ceb267" +SRCREV = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e" SRC_URI = "\ - git://github.com/docker/containerd.git;nobranch=1 \ + git://github.com/docker/containerd.git;branch=docker-1.13.x \ " # Apache-2.0 for containerd @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.code;md5=aadc30f9c14d876ded7bedc0afd2d3d7" S = "${WORKDIR}/git" -CONTAINERD_VERSION = "0.2.2" +CONTAINERD_VERSION = "0.2.3" PV = "${CONTAINERD_VERSION}+git${SRCREV}" DEPENDS = "go-cross-${TARGET_ARCH} \ -- cgit v1.2.3-54-g00ecf