Update to containerd bdf9f5f7388e8203e63a74b89800f7f3dd4a7743

Note that this is not the latest (which was 95efd45db073 at time of writing)
but the next commit 6428b4bad0c2 merges "Port ctr to use client package" breaks
the use of `ctr run --runtime-config` (by removing that option).

This contains https://github.com/containerd/containerd/pull/954 which was
causing some services to fail to start.

All previous uses of 15541037b9 are updated to
5749f2e9e6.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>

test/cases/000_build/000_outputs/test.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: dhcpcd
     image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"

test/cases/010_platforms/000_qemu/000_run_kernel/test.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: poweroff
     image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"

test/cases/010_platforms/000_qemu/010_run_iso/test.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: poweroff
     image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"

test/cases/010_platforms/000_qemu/020_run_efi/test.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: poweroff
     image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"

test/cases/010_platforms/000_qemu/030_run_qcow/test.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: poweroff
     image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"

test/cases/010_platforms/000_qemu/040_run_raw/test.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: poweroff
     image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"

test/cases/010_platforms/000_qemu/100_container/test.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: poweroff
     image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"

test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: poweroff
     image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"

test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: check-kernel-config
     image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c"

test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: check-kernel-config
     image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c"

test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: check-kernel-config
     image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c"

test/cases/020_kernel/010_kmod_4.9.x/kmod.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: check
     image: "kmod-test"

test/cases/030_security/000_docker-bench/test-docker-bench.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
   - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
   - name: sysctl

test/cases/040_packages/002_binfmt/test-binfmt.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: binfmt
     image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765"

test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
   - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
 onboot:
   - name: test

test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: dhcpcd
     image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"

test/cases/040_packages/013_mkimage/mkimage.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: mkimage
     image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3"

test/cases/040_packages/013_mkimage/run.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: poweroff
     image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28"

test/cases/040_packages/019_sysctl/test-sysctl.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: sysctl
     image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018"

test/hack/test-ltp.yml

@@ -4,7 +4,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: ltp
     image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d"

test/hack/test.yml

@@ -6,7 +6,7 @@ kernel:
 init:
   - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
   - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
-  - linuxkit/containerd:15541037b9d84352ee4b66d8cd43d2d4a3595d41
+  - linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf
 onboot:
   - name: dhcpcd
     image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"

test/pkg/virtsock/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 AS mirror
+FROM linuxkit/containerd:5749f2e9e65395cc6635229e8da0e0d484320ddf AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
     tini