Commit Graph
3 Commits
Author SHA1 Message Date
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
catinthesky ea6d92d351 Fixing issue of docker top command failure when dealing with -m option
Changed per requested review to refactor to make it more logic clear.

Current output for "docker top <contianer-id> m" option,eg:
root@b2c7ec58399d:/go/src/github.com/docker/docker# docker top 755d5871ec45 am
PID                 TTY                 STAT                TIME                COMMAND
148                 pts/0               -                   0:00                bash
-                   -                   Ss+                 0:00                -

fixing issue:#30580

Signed-off-by: catinthesky <yaozaiyong@hotmail.com>
Upstream-commit: a7497c39cdf78e817ad1372a8e3e16e0ccb77bb9
Component: engine
2017-03-10 02:50:21 +00:00
Akihiro Suda 6e2ed85ac6 Validate arguments for ps in docker top
Fix #24357

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 253933220965574422aa6679255359d8bd15d435
Component: engine
2016-07-08 05:58:11 +00:00