Merge pull request #2062 from rn/AkihiroSuda-containerd-test

Akihiro suda containerd test
2025-07-19 09:16:29 +00:00 · 2017-06-20 09:52:58 -07:00 · 2017-06-20 09:52:58 -07:00 · 4b124b5611
commit 4b124b5611
parent 324605c48c 9fb4780493
51 changed files with 148 additions and 47 deletions
--- a/examples/aws.yml
+++ b/examples/aws.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/examples/docker.yml
+++ b/examples/docker.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/examples/gcp.yml
+++ b/examples/gcp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/examples/minimal.yml
+++ b/examples/minimal.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/examples/node_exporter.yml
+++ b/examples/node_exporter.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 services:
  - name: getty
    image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5"
--- a/examples/packet.yml
+++ b/examples/packet.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/examples/redis-os.yml
+++ b/examples/redis-os.yml
@ -6,7 +6,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/examples/sshd.yml
+++ b/examples/sshd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/examples/swap.yml
+++ b/examples/swap.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
  - name: sysctl
--- a/examples/vmware.yml
+++ b/examples/vmware.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/examples/vpnkit-forwarder.yml
+++ b/examples/vpnkit-forwarder.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/examples/vsudd.yml
+++ b/examples/vsudd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/linuxkit.yml
+++ b/linuxkit.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@ -1,4 +1,4 @@
-FROM linuxkit/alpine:7cf5393e04fe0e26e9fa8f507379cacb64595918 as alpine
+FROM linuxkit/alpine:24fe1b6bbf1fc95b484741587acb10da6dbc9211 as alpine
 RUN \
  apk add \
  btrfs-progs-dev \
@ -10,11 +10,11 @@ RUN \
  make \
  && true
 ENV GOPATH=/go PATH=$PATH:/go/bin
-ENV CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90
 RUN mkdir -p $GOPATH/src/github.com/containerd && \
  cd $GOPATH/src/github.com/containerd && \
  git clone https://github.com/containerd/containerd.git
 WORKDIR $GOPATH/src/github.com/containerd/containerd
+# CONTAINERD_COMMIT is defined in linuxkit/alpine
 RUN git checkout $CONTAINERD_COMMIT
 RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\""
 RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/
--- a/projects/etcd/etcd.yml
+++ b/projects/etcd/etcd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/projects/ima-namespace/ima-namespace.yml
+++ b/projects/ima-namespace/ima-namespace.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
  - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
 onboot:
--- a/projects/kubernetes/kube-master.yml
+++ b/projects/kubernetes/kube-master.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/projects/kubernetes/kube-node.yml
+++ b/projects/kubernetes/kube-node.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/projects/logging/examples/logging.yml
+++ b/projects/logging/examples/logging.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 # with runc, logwrite, startmemlogd
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
  - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012
 onboot:
--- a/projects/miragesdk/examples/mirage-dhcp.yml
+++ b/projects/miragesdk/examples/mirage-dhcp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: sysctl
    image: linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018
--- a/projects/shiftfs/shiftfs.yml
+++ b/projects/shiftfs/shiftfs.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/projects/swarmd/swarmd.yml
+++ b/projects/swarmd/swarmd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
  - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/test/cases/000_build/000_outputs/test.yml
+++ b/test/cases/000_build/000_outputs/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
+++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml
+++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml
+++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml
+++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml
+++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/000_qemu/100_container/test.yml
+++ b/test/cases/010_platforms/000_qemu/100_container/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
+++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml
+++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: check-kernel-config
    image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1"
--- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml
+++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: check-kernel-config
    image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1"
--- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml
+++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: check-kernel-config
    image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1"
--- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml
+++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: check
    image: "kmod-test"
--- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml
+++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: sysctl
--- a/test/cases/030_security/010_ports/test.yml
+++ b/test/cases/030_security/010_ports/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: test
    image: "alpine:3.6"
--- a/test/cases/040_packages/002_binfmt/test-binfmt.yml
+++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: binfmt
    image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765"
--- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml
+++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
  - name: test
--- a/test/cases/040_packages/003_containerd/test-containerd.yml
+++ b/test/cases/040_packages/003_containerd/test-containerd.yml
@ -0,0 +1,19 @@
+kernel:
+  image: "linuxkit/kernel:4.9.x"
+  cmdline: "console=ttyS0 page_poison=1"
+init:
+  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
+  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
+  - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
+onboot:
+  - name: sysctl
+    image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018"
+  - name: test
+    image: "linuxkit/test-containerd:b9b6046f1eb8ed8a15eb70523bc584e7da657baa"
+  - name: poweroff
+    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
+trust:
+  org:
+    - linuxkit
+
--- a/test/cases/040_packages/003_containerd/test.sh
+++ b/test/cases/040_packages/003_containerd/test.sh
@ -0,0 +1,22 @@
+#!/bin/sh
+# SUMMARY: Run contianerd test
+# LABELS:
+# REPEAT:
+
+set -e
+
+# Source libraries. Uncomment if needed/defined
+#. "${RT_LIB}"
+. "${RT_PROJECT_ROOT}/_lib/lib.sh"
+
+clean_up() {
+	find . -iname "test-containerd*" -not -iname "*.yml" -exec rm -rf {} \;
+}
+trap clean_up EXIT
+
+# Test code goes here
+moby build test-containerd.yml
+RESULT="$(linuxkit run -mem 2048 test-containerd)"
+echo "${RESULT}" | grep -q "suite PASSED"
+
+exit 0
--- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml
+++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/test/cases/040_packages/013_mkimage/mkimage.yml
+++ b/test/cases/040_packages/013_mkimage/mkimage.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: mkimage
    image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3"
--- a/test/cases/040_packages/013_mkimage/run.yml
+++ b/test/cases/040_packages/013_mkimage/run.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: poweroff
    image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"
--- a/test/cases/040_packages/019_sysctl/test-sysctl.yml
+++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: sysctl
    image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018"
--- a/test/hack/test-ltp.yml
+++ b/test/hack/test-ltp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: ltp
    image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d"
--- a/test/hack/test.yml
+++ b/test/hack/test.yml
@ -6,7 +6,7 @@ kernel:
 init:
  - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
  - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
-  - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
+  - linuxkit/containerd:be69ded7ed4437e2989da850581b631bac877d3e
 onboot:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@ -0,0 +1,32 @@
+FROM linuxkit/alpine:24fe1b6bbf1fc95b484741587acb10da6dbc9211 AS mirror
+RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
+# btrfs-progfs is required for btrfs test (mkfs.btrfs)
+# util-linux is required for btrfs test (losetup)
+RUN apk add --no-cache --initdb -p /out \
+    alpine-baselayout \
+    busybox \
+    btrfs-progs \
+    btrfs-progs-dev \
+    gcc \
+    git \
+    go \
+    libc-dev \
+    linux-headers \
+    make \
+    musl \
+    util-linux
+RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
+
+FROM scratch
+COPY --from=mirror /out/ /
+ENV GOPATH=/go
+RUN mkdir -p $GOPATH/src/github.com/containerd && \
+  cd $GOPATH/src/github.com/containerd && \
+  git clone https://github.com/containerd/containerd.git
+WORKDIR $GOPATH/src/github.com/containerd/containerd
+# CONTAINERD_COMMIT is defined in linuxkit/alpine
+RUN git checkout $CONTAINERD_COMMIT
+ADD run.sh ./run.sh
+
+ENTRYPOINT ["/bin/sh", "run.sh"]
+LABEL org.mobyproject.config='{"net": "host", "capabilities": ["all"], "tmpfs": ["/tmp:exec"], "binds": ["/dev:/dev"]}'
--- a/test/pkg/containerd/Makefile
+++ b/test/pkg/containerd/Makefile
@ -0,0 +1,15 @@
+.PHONY: tag push
+default: push
+
+ORG?=linuxkit
+IMAGE=test-containerd
+DEPS=Dockerfile Makefile run.sh
+
+HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
+
+tag: $(DEPS)
+	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
+
+push: tag
+	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
+	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
--- a/test/pkg/containerd/run.sh
+++ b/test/pkg/containerd/run.sh
@ -0,0 +1,11 @@
+#!/bin/sh
+
+function failed {
+	printf "containerd test suite FAILED\n"
+	exit 1
+}
+
+# unset -race (does not work on alpine; see golang/go#14481)
+export TESTFLAGS=
+make root-test || failed
+printf "containerd test suite PASSED\n"
--- a/tools/alpine/Dockerfile
+++ b/tools/alpine/Dockerfile
@ -54,3 +54,5 @@ COPY --from=shellcheck /usr/local/bin/shellcheck /usr/local/bin/shellcheck
 COPY --from=shellcheck /usr/local/lib/ /usr/local/lib/

 RUN apk update && apk upgrade -a
+
+ARG CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90
--- a/tools/alpine/versions
+++ b/tools/alpine/versions
@ -49,7 +49,7 @@ glib-2.52.1-r0
 gmp-6.1.2-r0
 gmp-dev-6.1.2-r0
 gnutls-3.5.13-r0
-go-1.8.1-r0
+go-1.8.1-r2
 gummiboot-48.1-r0
 hvtools-4.4.15-r0
 icu-libs-58.2-r2
@ -130,7 +130,7 @@ lzo-2.10-r0
 m4-1.4.18-r0
 make-4.2.1-r0
 mesa-gbm-17.0.3-r1
-mkinitfs-3.1.0_rc1-r0
+mkinitfs-3.1.0-r0
 mpc1-1.0.3-r0
 mpfr3-3.1.5-r0
 mtools-4.0.18-r1