github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-13 05:39:23 +00:00
Code Issues Projects Releases Wiki Activity

Update to containerd bdf9f5f7388e8203e63a74b89800f7f3dd4a7743

Browse Source 
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>
This commit is contained in:
Ian Campbell
2017-06-07 09:12:08 +01:00
parent d0620eebf9
commit 0eb21735ae
62 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/aws.yml
View File

@@ -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

2
examples/docker.yml
View File

@@ -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

2
examples/gcp.yml
View File

@@ -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

2
examples/minimal.yml
View File

@@ -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"

2
examples/node_exporter.yml
View File

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

2
examples/packet.yml
View File

@@ -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

2
examples/redis-os.yml
View File

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

2
examples/sshd.yml
View File

@@ -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

2
examples/swap.yml
View File

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

2
examples/vmware.yml
View File

@@ -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

2
examples/vsudd.yml
View File

@@ -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"