Justin Cormack
f43e1cbf27
Move containerd init file from init package to containerd package
...
Otherwise it gets out of sync, and it makes little sense it being in
`init` now anyway.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-07-03 13:42:00 +01:00
Ian Campbell
9d2da9cabc
Update to containerd c215531a8f63a98a69134e804fea4ee6d354bb90
...
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 >
2017-06-16 13:42:24 +01:00
Dave Tucker
1af1a20a0d
containerd: Don't expose metrics by default
...
This can be turned on if required but we'll default to leaving it off
It's been enabled in the top-level linuxkit.yml
This port is also non-standard and there doesn't appear to be a standard
port for this as yet.
Signed-off-by: Dave Tucker <dt@docker.com >
2017-06-07 15:18:13 +01:00
Justin Cormack
d616cea3e1
Enable Prometheus metrics on port 13337 on containerd
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-04-16 10:43:44 -05:00
Justin Cormack
bc23fde1c2
Use the real default containerd toml config
...
Rather than an empty one.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-04-10 16:25:13 +01:00
Justin Cormack
fb5d6a8fad
Add an (empty) config file for containerd
...
It needs one now.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2017-04-08 21:38:31 +01:00
