Commit Graph

4 Commits

Author SHA1 Message Date
Daniel Nephin 4f0d95fa6e Add canonical import comment
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-02-05 16:51:57 -05:00
Kenfe-Mickael Laventure ddae20c032
Update libcontainerd to use containerd 1.0
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-20 07:11:37 -07:00
catinthesky a7497c39cd 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>
2017-03-10 02:50:21 +00:00
Akihiro Suda 2539332209 Validate arguments for `ps` in `docker top`
Fix #24357

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