toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,836 Commits 3 Branches 295 Tags
b04c87dc5b112e75d50262de2cd8f183bbf6f263
Commit Graph

4 Commits

Author SHA1 Message Date
Derek McGowan
b9ebe2f524 Add configuration option for containerd cri 
Disable cri plugin by default in containerd and
allows an option to enable the plugin. This only
has an effect on containerd when supervised by
dockerd. When containerd is managed outside of
dockerd, the configuration is not effected.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 8fb5f4d5c9b4933be31bf5371d65a95edb037261
Component: engine
 2018-07-24 11:34:47 -07:00
Daniel Nephin
be83c11fb0 Add canonical import comment 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067
Component: engine
 2018-02-05 16:51:57 -05:00
Brian Goff
9379e66070 Update containerd to v1 beta3 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d3f934e304d78296e606d6e3a2ca523d249e954c
Component: engine
 2017-11-10 15:44:10 -05:00
Kenfe-Mickael Laventure
044d7f995b Update libcontainerd to use containerd 1.0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: ddae20c032058a0fd42c34c2e9750ee8f6296ac8
Component: engine
 2017-10-20 07:11:37 -07:00