From bc23fde1c2108b7cba11405efbbb25a702149fa1 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 10 Apr 2017 16:25:13 +0100 Subject: [PATCH] Use the real default containerd toml config Rather than an empty one. Signed-off-by: Justin Cormack --- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/sshd.yml | 2 +- examples/vmware.yml | 2 +- moby.yml | 2 +- pkg/containerd/etc/containerd/config.toml | 16 ++++++++++++++++ projects/demo/etcd/etcd.yml | 2 +- projects/demo/intro/intro.yml | 2 +- projects/landlock/landlock.yml | 2 +- test/ltp/test-ltp.yml | 2 +- test/test.yml | 2 +- test/virtsock/test-virtsock-server.yml | 2 +- 12 files changed, 27 insertions(+), 11 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index 2c40cd124..dea3d3194 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 8e008e755..4a76dd065 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/sshd.yml b/examples/sshd.yml index 7f3312f64..801273d8a 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index ef3b20426..21fefe6e8 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/moby.yml b/moby.yml index f61a6a6d1..aca77ab76 100644 --- a/moby.yml +++ b/moby.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/pkg/containerd/etc/containerd/config.toml b/pkg/containerd/etc/containerd/config.toml index e69de29bb..74e36918b 100644 --- a/pkg/containerd/etc/containerd/config.toml +++ b/pkg/containerd/etc/containerd/config.toml @@ -0,0 +1,16 @@ +state = "/run/containerd" +root = "/var/lib/containerd" +snapshotter = "overlay" +subreaper = false + +[grpc] + address = "/run/containerd/containerd.sock" + uid = 0 + gid = 0 + +[debug] + address = "/run/containerd/debug.sock" + level = "info" + +[metrics] + address = "" diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml index e90bfce39..820d238cd 100644 --- a/projects/demo/etcd/etcd.yml +++ b/projects/demo/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/projects/demo/intro/intro.yml b/projects/demo/intro/intro.yml index dd618a5bb..904e5f5d5 100644 --- a/projects/demo/intro/intro.yml +++ b/projects/demo/intro/intro.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:925c88f42d92d57cd36b656db1f8757b152163a7 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b onboot: - name: sysctl image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index d2dbe00c5..8d7123346 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index 27ab203c9..5ce8d6e2e 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: ltp diff --git a/test/test.yml b/test/test.yml index a68c4a9f7..aafaadb0d 100644 --- a/test/test.yml +++ b/test/test.yml @@ -4,7 +4,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: check diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index 7b9b261ea..b0fa8e41b 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -8,7 +8,7 @@ kernel: init: - mobylinux/init:671bdce1ed0803daeb35e83e4bcd576bb449ea35 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 + - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl