Merge pull request #1278 from justincormack/containerd-up

Update containerd

base/containerd/Dockerfile

@@ -2,12 +2,14 @@ FROM golang:1.7-alpine3.5
 RUN \
   apk update && apk upgrade -a && \
   apk add --no-cache \
+  btrfs-progs-dev \
   gcc \
   git \
   libc-dev \
+  linux-headers \
   make \
   && true
-ENV CONTAINERD_COMMIT=1dc5d652ac1adf8f0a92ee8eff7af07b129d4e21
+ENV CONTAINERD_COMMIT=0e0ae74b824c71f991de4765711a383450d60655
 RUN mkdir -p $GOPATH/src/github.com/docker && \
   cd $GOPATH/src/github.com/docker && \
   git clone https://github.com/docker/containerd.git

base/init/Makefile

@@ -1,4 +1,4 @@
-CONTAINERD_IMAGE=mobylinux/containerd:6fac214f15f3dffc1c77d82874d828483b5ff0d0@sha256:59f9b78506a00c77c0fbde857a9dceb7812b9f4387c5d09ddc751ef7a42ae632
+CONTAINERD_IMAGE=mobylinux/containerd:c9c8a069da6dccd2803ab476ee0d57a8768f0dcb@sha256:ff5aa0b1086e8c600d6e1508cfae4da31e4935d36ec40f0128aa73113b664e7f
 CONTAINERD_BINARIES=usr/bin/containerd usr/bin/containerd-shim usr/bin/ctr usr/bin/dist
 
 RUNC_IMAGE=mobylinux/runc:f1cee12a65e7b7de06a01aec24609dc3175e1542@sha256:ff1ead6aa4388418ee07f8e93304e5b2fa9b975fe2399474d408654a1411a44a

moby.yaml

@@ -1,7 +1,7 @@
 kernel:
   image: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909"
   cmdline: "console=ttyS0 page_poison=1"
-init: "mobylinux/init:2f1b5c1be1157cb17e5b1e6dee171dccdebb5277"
+init: "mobylinux/init:defa5c959d7edde6d6ae695e055777669bf19edf"
 system:
   - name: sysctl
     image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"

test.yaml

@@ -1,7 +1,7 @@
 kernel:
   image: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909"
   cmdline: "console=ttyS0"
-init: "mobylinux/init:2f1b5c1be1157cb17e5b1e6dee171dccdebb5277"
+init: "mobylinux/init:defa5c959d7edde6d6ae695e055777669bf19edf"
 system:
   - name: binfmt
     image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01"