Commit Graph

4 Commits

Author SHA1 Message Date
2b85b35ea0 Truncating image id to 12 in docker ps
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
Upstream-commit: 1a2ccf59eefc14c6bd5abb23f0556ffc5c77bacf
Component: engine
2015-08-07 20:53:48 -04:00
82b6f1602c Fail fail when the ps format template is invalid.
Fixes error continuing execution when the parsing fails.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3d3db0d4af6cf483299a152133f19f9df760dc11
Component: engine
2015-08-05 13:22:24 -07:00
3dbbf38be7 Fix "docker ps" with no containers regression
The header row was not being printed when "docker ps" was invoked without containers thanks to the new format support, and we instead received a single blank line.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: f57fc03e3b39c225a05edfe217bd7616949d0dd0
Component: engine
2015-07-23 13:23:24 -07:00
a746d5f280 Docker ps custom formatting.
Docker-DCO-1.1-Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 37209190c76de66531acba848f1537da2899e32d
Component: engine
2015-07-20 22:46:55 -04:00