Added Docker::ps() "all" option.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cad1bbb9 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cad1bbb9 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cad1bbb9 Branch: refs/heads/master Commit: cad1bbb9c2ee0c51ed193f08e0d874951ed881dd Parents: bd8f063 Author: Yifan Gu <[email protected]> Authored: Tue Jun 24 18:09:25 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Mon Aug 4 15:08:15 2014 -0700 ---------------------------------------------------------------------- src/docker/docker.cpp | 8 +++++--- src/docker/docker.hpp | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/cad1bbb9/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index 1e4f62f..7d72ea2 100644 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -217,12 +217,14 @@ Future<Docker::Container> Docker::_inspect(const Subprocess& s) } -Future<list<Docker::Container> > Docker::ps() const +Future<list<Docker::Container> > Docker::ps(const bool all) const { - VLOG(1) << "Running " << path << " ps"; + string cmd = all ? " ps -a" : " ps"; + + VLOG(1) << "Running " << path << cmd; Try<Subprocess> s = subprocess( - path + " ps", + path + cmd, Subprocess::PIPE(), Subprocess::PIPE(), Subprocess::PIPE()); http://git-wip-us.apache.org/repos/asf/mesos/blob/cad1bbb9/src/docker/docker.hpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.hpp b/src/docker/docker.hpp index 264dc79..6aa25b1 100644 --- a/src/docker/docker.hpp +++ b/src/docker/docker.hpp @@ -72,8 +72,9 @@ public: process::Future<Container> inspect( const std::string& container) const; - // Performs 'docker ps'. - process::Future<std::list<Container> > ps() const; + // Performs 'docker ps (-a)'. + process::Future<std::list<Container> > ps( + const bool all = true) const; private: // Continuations.
