64d5c32b8e
Merge pull request #565 from thaJeztah/change-stats-format
...
Change default stats format and add --no-trunc flag
2017-09-28 15:14:43 -04:00
e63417a9c0
Add --no-trunc option to docker container stats
...
This patch adds a `--no-trunc` option to `docker container stats`;
With this patch applied, the default output is:
CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
b95a83497c91 awesome_brattain 0.28% 5.629MiB / 1.952GiB 0.28% 916B / 0B 147kB / 0B 9
67b2525d8ad1 foobar 0.00% 1.727MiB / 1.952GiB 0.09% 2.48kB / 0B 4.11MB / 0B 2
e5c383697914 test-1951.1.kay7x1lh1twk9c0oig50sd5tr 0.00% 196KiB / 1.952GiB 0.01% 71.2kB / 0B 770kB / 0B 1
4bda148efbc0 random.1.vnc8on831idyr42slu578u3cr 0.00% 1.672MiB / 1.952GiB 0.08% 110kB / 0B 578kB / 0B 2
84e3deaa45b2 registry 0.01% 3.402MiB / 1.952GiB 0.17% 127kB / 378B 233kB / 0B 10
2ed915778ceb foo.1.lsmxrefn5yp9c9ijz1hzgdq4u 0.00% 1.727MiB / 1.952GiB 0.09% 166kB / 7.76kB 614kB / 0B 2
Addin the `--no-trunc` option, changes the output to:
CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
b95a83497c9161c9b444e3d70e1a9dfba0c1840d41720e146a95a08ebf938afc awesome_brattain 0.25% 5.75MiB / 1.952GiB 0.29% 648B / 0B 147kB / 0B 10
67b2525d8ad10bb236a49960e93c09993b0baabeef12c2d46cd5f4fbb6f4808c foobar 0.00% 1.727MiB / 1.952GiB 0.09% 2.35kB / 0B 4.11MB / 0B 2
e5c383697914b98b10cbbc9d0bd324b7b927099ac584f031057b8208d2fba9b1 test-1951.1.kay7x1lh1twk9c0oig50sd5tr 0.00% 196KiB / 1.952GiB 0.01% 71.1kB / 0B 770kB / 0B 1
4bda148efbc006b0063373c3678083159af89f8cc83a6a28def14cb0dd171f70 random.1.vnc8on831idyr42slu578u3cr 0.00% 1.672MiB / 1.952GiB 0.08% 110kB / 0B 578kB / 0B 2
84e3deaa45b2fc363e06167df9b90ab59f88d4f101e3f9b8df03a62a8f6783e1 registry 0.00% 3.387MiB / 1.952GiB 0.17% 127kB / 378B 233kB / 0B 10
2ed915778cebddf9ec69263a75cfdcf00962a5198d94d42cda75d5cd45bb82f2 foo.1.lsmxrefn5yp9c9ijz1hzgdq4u 0.00% 1.727MiB / 1.952GiB 0.09% 166kB / 7.76kB 614kB / 0B 2
Which is the same as the default before this patch was applied.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-27 18:59:25 +02:00
0a78472211
Update default output format for stats to include ID and Name
...
The `docker container stats` output has a column (`CONTAINER`), that shows either
the container _id_ or container _name_, depending on the arguments given.
For example, running `docker container stats foobar` shows:
CONTAINER CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
foobar 0.00% 1.938MiB / 1.952GiB 0.10% 782B / 0B 4.11MB / 0B 2
Whereas `docker container stats 67b2525d8ad1` (`67b2525d8ad1` being the ID for
container `foobar`) shows:
CONTAINER CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
67b2525d8ad1 0.00% 1.938MiB / 1.952GiB 0.10% 916B / 0B 4.11MB / 0B 2
This behavior is confusing.
This patch updates the default output format for `docker stats` to use separate
columns for container ID and container Name (similar to `docker container ls`).
With this patch applied, both commands show the same output:
$ docker container stats foobar
CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
67b2525d8ad10bb236a49960e93c09993b0baabeef12c2d46cd5f4fbb6f4808c foobar 0.00% 1.938MiB / 1.952GiB 0.10% 1.25kB / 0B 4.11MB / 0B 2
$ docker container stats 67b2525d8ad1
CONTAINER ID NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
67b2525d8ad10bb236a49960e93c09993b0baabeef12c2d46cd5f4fbb6f4808c foobar 0.00% 1.938MiB / 1.952GiB 0.10% 1.31kB / 0B 4.11MB / 0B 2
Users that want to use the old format can configure a custom format in the
cli configuration file (`~/.docker/config.json`);
on Linux:
{
"statsFormat" : "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.MemPerc}}\t{{.NetIO}}\t{{.BlockIO}}\t{{.PIDs}}"
}
on Windows:
{
"statsFormat" : "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.NetIO}}\t{{.BlockIO}}"
}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-27 18:05:51 +02:00
feb4d79935
Merge pull request #562 from dnephin/update-gometalinter
...
Update gometalinter
2017-09-27 09:42:37 +02:00
e27e07a8a9
Merge pull request #563 from riyazdf/remove-extra-options
...
trust: remove extraneous OPTIONS from commands that do not use it
2017-09-27 09:41:33 +02:00
9ad0e8f223
trust: remove extraneous OPTIONS from commands that do not use it
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-26 16:15:45 -07:00
62d62ff513
Merge pull request #557 from allencloud/add-more-event-filter-type
...
Add more event filters in doc: config, node, secret and service
2017-09-26 22:48:22 +02:00
4203b49431
Refactor image commands to make use of the new trust struct for trusted pull
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-26 15:15:42 -04:00
d956386b2d
Update gometalinter
...
The update includes bug fixes in gometalinter and updates to linters, which
discovered more linter problems.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-26 12:33:35 -04:00
fc98f8757a
add more event filters in doc: config, node, secret and service
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
2017-09-27 00:04:56 +08:00
0856c20e04
Merge pull request #551 from dnephin/set-local-constant
...
Use a local constant
2017-09-26 17:42:50 +02:00
b77f3fd5ac
Merge pull request #555 from joaofnfernandes/docs/advertise-addr
...
Add note about joining through a load balancer
2017-09-26 17:15:42 +02:00
be8dab26a3
Merge pull request #451 from tych0/use-pass-backend
...
Use pass backend
2017-09-26 16:40:32 +02:00
a2f116733b
document the pass backend and default behavior
...
Also add a big warning about cleartext passwords.
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-09-26 08:31:02 -06:00
af3cdccf52
Merge pull request #472 from riyazdf/docker-trust
...
docker trust: view, revoke, sign subcommands (experimental)
2017-09-25 17:26:52 -07:00
8595d15d60
Add note about joining through a load balancer
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
2017-09-25 10:53:20 -07:00
e07f345267
mark command as experimental in docs and cli
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:39:46 -07:00
c6db0cd7a1
trust: rename inspect to view, add repo name to signer table header
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:39:46 -07:00
46a879e3b9
tests: use alice/bob/claire conventional names for signers
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:39:46 -07:00
4e95fcd72c
trust: update remove to error on empty references for consistency
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:39:46 -07:00
67cf09cbe1
tests: move trust test to proper package
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:39:46 -07:00
4e89dc800a
trust: update reference type and use golden output
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:39:44 -07:00
6fca400f1e
tests: address review feedback
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:38:41 -07:00
f667bd7559
trust: use mock CLI for testing offline
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:38:40 -07:00
e5c35ab9d1
cli: introduce NotaryClient getter
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:38:38 -07:00
7c5b836ca5
trust: add Repository client interface
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:54 -07:00
45c102a03d
trust: address review feedback, refactor to align with existing cli/command semantics
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
007aff70bf
docs: update docker trust docs with correct tense and formatting
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
43717a866e
trust revoke: docs for docker trust revoke
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
609f8b4b81
trust revoke: add docker trust revoke command
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
bc665ed762
trust sign: docs for docker trust sign
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
fab6bb6798
trust sign: add docker trust sign command
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
809ef0fd74
trust inspect: docs for docker trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:53 -07:00
ec6bc9460f
trust inspect: add docker trust inspect command with formatting print
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:52 -07:00
5846e6e5d5
trust: update existing code for new vendoring, refactor for docker trust code sharing
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:52 -07:00
fb1cbaeb66
vendor: upgrade notary version for docker trust
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-09-25 09:34:52 -07:00
bd6e1757f5
Merge pull request #307 from allencloud/sort-secrets-and-configs-in-cli
...
using nature sort secrets and configs in cli
2017-09-25 09:41:50 +02:00
26f06c5bcb
sort secrets and configs in cli
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
2017-09-25 13:18:13 +08:00
a41caadef0
Merge pull request #546 from dnephin/fix-version-on-failure
...
Set APIVersion on the client, even when Ping fails
2017-09-23 09:04:03 -04:00
29c4f0df57
Merge pull request #552 from allencloud/volume-has-no-id
...
remove volume id because it only has name
2017-09-23 08:58:37 -04:00
fe1c1b6b5c
remove volume id because it only has name
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
2017-09-23 11:26:56 +08:00
32612058cb
Use a local constant
...
This constant is going to be removed from jsonlog package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-22 17:59:46 -04:00
e828efa4ab
Set APIVersion on the client, even when Ping fails
...
Refactor to support testing
Also add tests
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-22 10:08:19 -04:00
713e87e780
prefer `pass` backend if it is available
...
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-09-20 11:15:49 -06:00
6bd5c63c78
version bump for docker-credential-helpers
...
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-09-20 11:15:49 -06:00
4cf1849418
defaultCredentialStore: make this a function
...
In the next patch, we'll use this to implement some logic about which
password backend to use.
Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-09-20 11:14:27 -06:00
10e292dbab
Merge pull request #545 from thaJeztah/fix-nocopy-description
...
Fix nocopy description
2017-09-20 17:54:55 +02:00
09c8f47af1
Merge pull request #544 from vdemeester/fix-build-loading
...
Fix loader error with different build syntax
2017-09-20 11:03:54 -04:00
0e72a6ff81
Fix nocopy description
...
nocopy does not apply to bind mounts, only volumes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-20 16:43:15 +02:00
da82dcb1db
Merge pull request #504 from albers/completion-search--format
...
Add bash completion for `search --format`
2017-09-20 14:41:28 +02:00
Daniel Nephin
Sebastiaan van Stijn
Vincent Demeester
Riyaz Faizullabhoy
Sebastiaan van Stijn
Daniel Nephin
Allen Sun
Tycho Andersen
Victor Vieux
Joao Fernandes
allencloud
Brian Goff