p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,617 Commits 2 Branches 295 Tags
a6c488e8bc216efce3dc1bee1602ae2c231c95d6
Commit Graph

4518 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
a6c488e8bc Do not truncate ID on docker service ps --quiet 
Running `docker service ps --quiet` should print the
full, non-truncated ID, even if the `--no-trunc` option
is not set.

This patch disables truncation if the `--quiet` flag
is set.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c5f267d95c
Component: cli
 2017-09-30 22:23:37 +02:00
Stephen J Day
a0cdbef9a2 cli/command/container: ensure channel is allocated 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: e78772af4d
Component: cli
 2017-09-29 18:12:03 -07:00
Sebastiaan van Stijn
1ef62ff784 Bump version to 17.11.0-dev 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2a82adcbe0
Component: cli
 2017-09-30 00:59:27 +02:00
Sebastiaan van Stijn
4b8b813d22 Merge pull request #570 from thaJeztah/bump-moby-vendor 
Bump moby vendor to 14ce1f1cf48e9859223c6311de58aec4dc
Upstream-commit: 31908a4b45
Component: cli
 2017-09-29 23:08:16 +02:00
Victor Vieux
0e6592d05e Merge pull request #572 from thaJeztah/bump-vendor-for-powerpc 
revendor logrus and x/crypto
Upstream-commit: 00cc728dfb
Component: cli
 2017-09-29 13:58:38 -07:00
Sebastiaan van Stijn
c9fbb737e9 Fixes for updated dependencies 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0082310aa5
Component: cli
 2017-09-29 17:45:31 +02:00
Sebastiaan van Stijn
c9e8020d97 bump moby/moby and dependencies to 14ce1f1cf48e9859223c6311de58aec4dc0f046c 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 98dbfeee76
Component: cli
 2017-09-29 17:44:49 +02:00
Sebastiaan van Stijn
6230f06c47 revendor logrus and x/crypto 
updates to the same version as is currently used
on moby/moby; this bump contains fixes for ppc64le.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e3b7700fb9
Component: cli
 2017-09-29 15:32:42 +02:00
Sebastiaan van Stijn
5edb9ec08c Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384 
Includes a fix to cleanup unused vendor-directories

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 368b639e7e
Component: cli
 2017-09-29 14:58:05 +02:00
Sebastiaan van Stijn
b4a6a3d358 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>
Upstream-commit: e63417a9c0
Component: cli
 2017-09-27 18:59:25 +02:00
Sebastiaan van Stijn
a58b05b91c 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>
Upstream-commit: 0a78472211
Component: cli
 2017-09-27 18:05:51 +02:00
Vincent Demeester
689b8ff233 Merge pull request #562 from dnephin/update-gometalinter 
Update gometalinter
Upstream-commit: feb4d79935
Component: cli
 2017-09-27 09:42:37 +02:00
Riyaz Faizullabhoy
bb1eca37a9 trust: remove extraneous OPTIONS from commands that do not use it 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 9ad0e8f223
Component: cli
 2017-09-26 16:15:45 -07:00
Sebastiaan van Stijn
23c421f3c5 Merge pull request #557 from allencloud/add-more-event-filter-type 
Add more event filters in doc: config, node, secret and service
Upstream-commit: 62d62ff513
Component: cli
 2017-09-26 22:48:22 +02:00
Daniel Nephin
dead314452 Refactor image commands to make use of the new trust struct for trusted pull 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4203b49431
Component: cli
 2017-09-26 15:15:42 -04:00
Daniel Nephin
f321e1ed9d 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>
Upstream-commit: d956386b2d
Component: cli
 2017-09-26 12:33:35 -04:00
Allen Sun
86f10d67d5 add more event filters in doc: config, node, secret and service 
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
Upstream-commit: fc98f8757a
Component: cli
 2017-09-27 00:04:56 +08:00
Sebastiaan van Stijn
399de7ee20 Merge pull request #551 from dnephin/set-local-constant 
Use a local constant
Upstream-commit: 0856c20e04
Component: cli
 2017-09-26 17:42:50 +02:00
Sebastiaan van Stijn
57dd97eab1 Merge pull request #555 from joaofnfernandes/docs/advertise-addr 
Add note about joining through a load balancer
Upstream-commit: b77f3fd5ac
Component: cli
 2017-09-26 17:15:42 +02:00
Sebastiaan van Stijn
9e59512fe4 Merge pull request #451 from tych0/use-pass-backend 
Use pass backend
Upstream-commit: be8dab26a3
Component: cli
 2017-09-26 16:40:32 +02:00
Tycho Andersen
1fe51e0bb7 document the pass backend and default behavior 
Also add a big warning about cleartext passwords.

Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: a2f116733b
Component: cli
 2017-09-26 08:31:02 -06:00
Joao Fernandes
025e41d2ae Add note about joining through a load balancer 
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
Upstream-commit: 8595d15d60
Component: cli
 2017-09-25 10:53:20 -07:00
Riyaz Faizullabhoy
702bac1553 mark command as experimental in docs and cli 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: e07f345267
Component: cli
 2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
e0bca90fda trust: rename inspect to view, add repo name to signer table header 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: c6db0cd7a1
Component: cli
 2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
94f2b59302 tests: use alice/bob/claire conventional names for signers 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 46a879e3b9
Component: cli
 2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
188ec7af2a trust: update remove to error on empty references for consistency 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 4e95fcd72c
Component: cli
 2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
a59fc63f3b tests: move trust test to proper package 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 67cf09cbe1
Component: cli
 2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
7c83ece8ef trust: update reference type and use golden output 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 4e89dc800a
Component: cli
 2017-09-25 09:39:44 -07:00
Riyaz Faizullabhoy
1659928f34 tests: address review feedback 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 6fca400f1e
Component: cli
 2017-09-25 09:38:41 -07:00
Riyaz Faizullabhoy
51f87f33d4 trust: use mock CLI for testing offline 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: f667bd7559
Component: cli
 2017-09-25 09:38:40 -07:00
Riyaz Faizullabhoy
93ba24cc42 cli: introduce NotaryClient getter 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: e5c35ab9d1
Component: cli
 2017-09-25 09:38:38 -07:00
Riyaz Faizullabhoy
b53048a314 trust: add Repository client interface 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 7c5b836ca5
Component: cli
 2017-09-25 09:34:54 -07:00
Riyaz Faizullabhoy
e42a2df102 trust: address review feedback, refactor to align with existing cli/command semantics 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 45c102a03d
Component: cli
 2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
e92c4686dd docs: update docker trust docs with correct tense and formatting 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 007aff70bf
Component: cli
 2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
97f2ec42fa trust revoke: docs for docker trust revoke 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 43717a866e
Component: cli
 2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
e8d4ecb361 trust revoke: add docker trust revoke command 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 609f8b4b81
Component: cli
 2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
ad5c7cb4bb trust sign: docs for docker trust sign 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: bc665ed762
Component: cli
 2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
644ae3a3f1 trust sign: add docker trust sign command 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: fab6bb6798
Component: cli
 2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
1115dc5cef trust inspect: docs for docker trust inspect 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 809ef0fd74
Component: cli
 2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
530ee183f1 trust inspect: add docker trust inspect command with formatting print 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: ec6bc9460f
Component: cli
 2017-09-25 09:34:52 -07:00
Riyaz Faizullabhoy
742798f154 trust: update existing code for new vendoring, refactor for docker trust code sharing 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 5846e6e5d5
Component: cli
 2017-09-25 09:34:52 -07:00
Riyaz Faizullabhoy
86beae9d05 vendor: upgrade notary version for docker trust 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: fb1cbaeb66
Component: cli
 2017-09-25 09:34:52 -07:00
allencloud
fdeab20153 sort secrets and configs in cli 
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
Upstream-commit: 26f06c5bcb
Component: cli
 2017-09-25 13:18:13 +08:00
Brian Goff
0f097012c8 Merge pull request #546 from dnephin/fix-version-on-failure 
Set APIVersion on the client, even when Ping fails
Upstream-commit: a41caadef0
Component: cli
 2017-09-23 09:04:03 -04:00
Allen Sun
a0ff43ff51 remove volume id because it only has name 
Signed-off-by: Allen Sun <shlallen1990@gmail.com>
Upstream-commit: fe1c1b6b5c
Component: cli
 2017-09-23 11:26:56 +08:00
Daniel Nephin
f3a4b20d25 Use a local constant 
This constant is going to be removed from jsonlog package.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 32612058cb
Component: cli
 2017-09-22 17:59:46 -04:00
Daniel Nephin
441f6cef6d Set APIVersion on the client, even when Ping fails 
Refactor to support testing
Also add tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e828efa4ab
Component: cli
 2017-09-22 10:08:19 -04:00
Tycho Andersen
9337e13113 prefer pass backend if it is available 
Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: 713e87e780
Component: cli
 2017-09-20 11:15:49 -06:00
Tycho Andersen
6280c12bb9 version bump for docker-credential-helpers 
Signed-off-by: Tycho Andersen <tycho@docker.com>
Upstream-commit: 6bd5c63c78
Component: cli
 2017-09-20 11:15:49 -06:00
Tycho Andersen
315e815656 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>
Upstream-commit: 4cf1849418
Component: cli
 2017-09-20 11:14:27 -06:00