Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,630 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

1070 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 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
Riyaz Faizullabhoy 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
Sebastiaan van Stijn 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
Allen Sun 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn be8dab26a3 Merge pull request #451 from tych0/use-pass-backend 
Use pass backend
 2017-09-26 16:40:32 +02:00
Tycho Andersen 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
Joao Fernandes 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
Riyaz Faizullabhoy 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
Riyaz Faizullabhoy 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
Riyaz Faizullabhoy 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
Riyaz Faizullabhoy 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
Riyaz Faizullabhoy 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
Riyaz Faizullabhoy 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
Riyaz Faizullabhoy 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
Allen Sun 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
Sebastiaan van Stijn 01ef9acd31
Fix service_create markdown 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-09-19 16:29:52 +02:00
Sebastiaan van Stijn d4251b4268 Merge pull request #526 from thaJeztah/docs-fix-system-prune 
Update system prune docs for --volumes flag
 2017-09-18 19:10:46 +02:00
Sebastiaan van Stijn e612236a3d
Remove .swp file that was accidentally added 
This file was added by accident in dd95731a21
and not noticed during review.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-09-15 13:20:40 +02:00
Sebastiaan van Stijn e2ee30ae42 Merge pull request #534 from mion00/document_node_hostname_templating 
Document .Node.Hostname templating
 2017-09-15 13:02:31 +02:00
Vincent Demeester 5a7f25f24c Merge pull request #442 from jhowardmsft/jjh/34508docs 
Docs for Windows daemon graphdriver options
 2017-09-15 12:19:14 +02:00
Carlo Mion 21825b6842 Document .Node.Hostname templating 
Update placeholders table and add example code
Follow up to moby/moby#34686

Signed-off-by: Carlo Mion <mion00@gmail.com>
 2017-09-15 10:23:56 +02:00
Sebastiaan van Stijn b4db84de69
Update system prune docs for --volumes flag 
The `--volumes` flag was added in 37fd6128dc,
but the documentation was not updated.

This patch updates the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-09-14 00:42:12 +02:00
Tobias Gesellchen f8ed8d22c6 [docs] Fix typo in configration. 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2017-09-10 23:12:29 +02:00
Vincent Demeester 21b5bbe411 Merge pull request #454 from mstanleyjones/resource-updating-windows 
docker update does not work on Windows containers
 2017-08-25 19:57:12 +02:00
Misty Stanley-Jones 047d3c23a7 docker update does not work on Windows containers 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-08-25 10:35:28 -07:00
Vincent Demeester 8ebc03a71f Merge pull request #367 from kolyshkin/ipcmode 
Introduce/document new IPC modes
 2017-08-25 09:48:00 +02:00
Rubens Figueiredo dd95731a21 Added docker documentation for Expose 
Signed-off-by: Rubens Figueiredo <r.figueiredo.52@gmail.com>
 2017-08-23 16:12:46 -07:00
Daniel Nephin 05308fcec7 Merge pull request #440 from ripcurld0/search_format 
Add --format to docker-search
 2017-08-22 19:10:53 -04:00
Boaz Shuster 88cc47ad5c Add --format to docker-search 
Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-08-23 01:37:54 +03:00
Marco Mariani 3a0b967c05 support --compose-file - as stdin 
Signed-off-by: Marco Mariani <marco.mariani@alterway.fr>
 2017-08-22 17:55:59 +02:00
Christophe Vidal 037029414d Dropped hyphen in bind mount where appropriate 
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
 2017-08-19 21:14:48 +07:00
Sebastiaan van Stijn 3c7ede6a68 Merge pull request #205 from redpanda/rollback 
Add 'docker service rollback' subcommand
 2017-08-19 15:56:14 +02:00
Sebastiaan van Stijn 9544b70cb3
Fix typo and minor Markdown edits 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-08-17 02:29:24 +02:00
Jimmy Leger 11d471d660 Add 'docker service rollback' subcommand 
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Implement runRollback to not use runUpdate

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Add version tag and add flag quiet to suppress progress output

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Removed flags from warnDetachDefault

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Used command.Cli interface

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Add detach flag on rollback command

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Create a fakeClient for service commands

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Added unit test for rollback command

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Used command.Cli interface instead of *command.DockerCli in service commands

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Revert "Removed flags from warnDetachDefault"

This reverts commit 3e4f601c8a82cc2599a755dc693409bbc47917fc.

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Fixed test.NewFakeCli instanciation

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Removed unused receiver

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Replaced cli by dockerCli

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Revert "Removed unused receiver"

This reverts commit 604ef7c13df3d019949ca81d992db501114dafce.

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>

Fixed last typo

Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>
 2017-08-16 22:18:36 +02:00
Christophe Vidal 9c4b9c6f63 Updated & reformulated kinds of mounts section 
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
 2017-08-17 00:51:35 +07:00
John Howard c848f9acb6 Docs for Windows daemon graphdriver options 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-08-15 10:20:15 -07:00
Vincent Demeester b8d325efd5 Merge pull request #432 from lukahartwig/docs-add-docker-events-examples 
Added docker events example with until option to documentation
 2017-08-14 10:57:46 +02:00
bryfry 6118658f73 Make the example match the documentation 
the missing `driver` made my bridge not have the correct MTU when i copied from the example and not the doc table.  Brings them into alignment.

Signed-off-by: bryfry <bryon@fryer.io>
 2017-08-11 21:47:34 -04:00
Luka Hartwig f959ac7fba Added docker events example with until option to documentation 
Signed-off-by: Luka Hartwig <mail@lukahartwig.de>
 2017-08-11 01:29:48 +02:00
Harald Albers 2dca576a4c Fix invalid plugin references in docs 
The plugins `tiborvass/sample-volume-plugins` and `tiborvass/no-remove`
do not exist.

Signed-off-by: Harald Albers <github@albersweb.de>
 2017-08-07 11:15:39 +02:00
Kir Kolyshkin 9285db6752 Introduce/document new IPC modes 
This builds (and depends) on https://github.com/moby/moby/pull/34087

Version 2:
 - remove --ipc argument validation (it is now done by daemon)
 - add/document 'none' value
 - docs/reference/run.md: add a table with better modes description
 - dockerd(8) typesetting fixes

Version 3:
 - remove ipc mode tests from cli/command/container/opts_test.go

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2017-08-05 17:49:53 -07:00
Vincent Demeester b0cc841631 Merge pull request #405 from beenanner/patch-1 
Fix missing missing backtick in documentation for node ls
 2017-08-02 08:58:53 +02:00
Jonathan Lee 9e4ad4889e Fix missing missing backtick 
Signed-off-by: Jonathan Lee <jonjohn1232009@gmail.com>
 2017-08-01 20:45:43 -04:00
Vincent Demeester c6e497d15c Merge pull request #403 from Zebrilee/fix-issue-159 
update service create and update options in commandline documentation
 2017-08-01 14:08:29 +02:00
zebrilee 5fe09164f5 update service create and update options in commandline documentation 
Signed-off-by: zebrilee <zebrilee@gmail.com>
 2017-07-31 23:26:02 +02:00
Sebastiaan van Stijn f47d9803fd Merge pull request #399 from Zebrilee/fix-issue-253 
modify foo by container in order to clarify the documentation
 2017-07-31 10:40:08 -07:00
Sebastiaan van Stijn 7ac1db2f8f Merge pull request #393 from thaJeztah/add-missing-is-task-filter 
Docs: update filter options for docker container ps
 2017-07-31 09:51:13 +01:00
zebrilee 2d5f9d83e7 modify foo by container in order to clarify the documentation 
Signed-off-by: zebrilee <zebrilee@gmail.com>
 2017-07-29 20:44:50 +02:00
Kir Kolyshkin 6d85a4f5f8 Fix repo references in docs 
Since CLI was moved to a separate repo, these references are incorrect.
Fixed with the help of sed script, verified manually.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2017-07-28 10:32:42 -07:00