3 files changed, 11 insertions, 10 deletions

diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
index 1a2c4454..24a51bc4 100644
--- a/recipes-containers/containerd/containerd_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -4,7 +4,7 @@ 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 = "ca47f7e76a93e9b3768ed084d62318e85bd9f4b2"
+SRCREV = "0ac3cd1be170d180b2baed755e8f0da547ceb267"
 SRC_URI = "\
         git://github.com/docker/containerd.git;nobranch=1 \
         "
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.code;md5=aadc30f9c14d876ded7bedc0afd2d3d7"
 
 S = "${WORKDIR}/git"
 
-CONTAINERD_VERSION = "0.2.0"
+CONTAINERD_VERSION = "0.2.2"
 PV = "${CONTAINERD_VERSION}+git${SRCREV}"
 
 DEPENDS = "go-cross \
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 97700f02..f3c940d1 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV = "5604cbed50d51c4039b1abcb1cf87c4e01bce924"
+SRCREV = "34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b"
 SRC_URI = "\
         git://github.com/docker/docker.git;nobranch=1 \
         file://docker.service \
@@ -32,7 +32,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cc2221abf0b96ea39dd68141b70f7937"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "1.11.1"
+DOCKER_VERSION = "1.12.0"
 PV = "${DOCKER_VERSION}+git${SRCREV}"
 
 DEPENDS = "go-cross \
@@ -108,7 +108,9 @@ INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}"
 
 do_install() {
         mkdir -p ${D}/${bindir}
-        cp ${S}/bundles/${DOCKER_VERSION}/dynbinary/docker-${DOCKER_VERSION} ${D}/${bindir}/docker
+        cp ${S}/bundles/latest/dynbinary-client/docker ${D}/${bindir}/docker
+        cp ${S}/bundles/latest/dynbinary-daemon/dockerd ${D}/${bindir}/dockerd
+        cp ${S}/bundles/latest/dynbinary-daemon/docker-proxy ${D}/${bindir}/docker-proxy
 
         if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
                 install -d ${D}${systemd_unitdir}/system
diff --git a/recipes-containers/runc/runc_git.bb b/recipes-containers/runc/runc_git.bb
index 955ea93c..905a751b 100644
--- a/recipes-containers/runc/runc_git.bb
+++ b/recipes-containers/runc/runc_git.bb
@@ -4,10 +4,9 @@ DESCRIPTION = "runc is a CLI tool for spawning and running containers according
 
 # Note: this rev is before the required protocol field, update when all components
 #       have been updated to match.
-SRCREV = "baf6536d6259209c3edfa2b22237af82942d3dfa"
+SRCREV = "1cdaa709f151b61cee2bdaa09d8e5d2b58a8ba72"
 SRC_URI = "\
         git://github.com/opencontainers/runc;branch=master \
-        file://0001-nsexec-fix-build-against-musl-libc.patch \
         "
 
 # Apache-2.0 for containerd
@@ -16,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8"
 
 S = "${WORKDIR}/git"
 
-RUNC_VERSION = "0.1.1"
+RUNC_VERSION = "1.0.0-rc1"
 PV = "${RUNC_VERSION}+git${SRCREV}"
 
 DEPENDS = "go-cross \
@@ -49,10 +48,10 @@ do_compile() {
         # Pass the needed cflags/ldflags so that cgo
         # can find the needed headers files and libraries
         export CGO_ENABLED="1"
+        export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
+        export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
         export CFLAGS=""
         export LDFLAGS=""
-        export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
-        export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
 
         oe_runmake static
 }