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

Update to containerd c215531a8f63a98a69134e804fea4ee6d354bb90

Browse Source 
This includes https://github.com/containerd/containerd/pull/994 and hence
requires updating the various instances of `/etc/containerd/config.toml`.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell
2017-06-14 16:35:33 +01:00
parent d51784adc0
commit 9d2da9cabc
45 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/etcd/etcd.yml
View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
onboot:
- name: sysctl

2
projects/ima-namespace/ima-namespace.yml
View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
- linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
onboot:

2
projects/kubernetes/kube-master.yml
View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
onboot:
- name: sysctl

2
projects/kubernetes/kube-node.yml
View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
onboot:
- name: sysctl

2
projects/logging/examples/logging.yml
View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 # with runc, logwrite, startmemlogd
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
- linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012
onboot:

2
projects/miragesdk/examples/mirage-dhcp.yml
View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
onboot:
- name: sysctl
image: linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018

5
projects/shiftfs/shiftfs.yml
View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd
- linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
onboot:
- name: sysctl
@@ -34,7 +34,8 @@ files:
contents: |
state = "/run/containerd"
root = "/var/lib/containerd"
snapshotter = "overlay"
snapshotter = "io.containerd.snapshotter.v1.overlayfs"
differ = "io.containerd.differ.v1.base-diff"
subreaper = false
[grpc]

2
projects/swarmd/swarmd.yml
View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037
- linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38
- linuxkit/containerd:7858fceb91c26c1e2ae9d84ac1ea0c63bbe61e26
- linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973
- linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d
onboot:
- name: sysctl