Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Carry 17414] Added additional container information to "docker info". #19249

Merged
merged 2 commits into from
Jan 13, 2016

Conversation

calavera
Copy link
Contributor

Carry #17414.

WAIT BEFORE MERGE: This PR is blocked by docker/engine-api#36

Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.

Signed-off-by: Kim Eik <kim@heldig.org>
(cherry picked from commit a9804ab)
@calavera
Copy link
Contributor Author

Vendoring is happening in #19243.

@@ -112,6 +112,7 @@ This section lists each version from latest to oldest. Each listing includes a
* `GET /networks` now supports filtering by `name`, `id` and `type`.
* `POST /containers/create` now allows you to set the static IPv4 and/or IPv6 address for the container.
* `POST /networks/(id)/connect` now allows you to set the static IPv4 and/or IPv6 address for the container.
* `GET /info` now includes the number of containers running, stopped and paused.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should have a comma before and paused. (just a nit)

@thaJeztah
Copy link
Member

two really tiny nits, LGTM otherwise

Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Copy link
Contributor Author

fixed.

@thaJeztah
Copy link
Member

LGTM

moving to "merge", taking previous LGTM's from #17414 into account

@thaJeztah
Copy link
Member

😭 janky, nooooo

01:17:45 Build timed out (after 120 minutes). Marking the build as failed.

runcom added a commit that referenced this pull request Jan 13, 2016
[Carry 17414] Added additional container information to "docker info".
@runcom runcom merged commit a79f968 into moby:master Jan 13, 2016
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants