docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
4,631 Commits 12 Branches 296 Tags
afca8202d76e8970ac399f0fcd5d7b2ee3450808
Commit Graph

4631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
afca8202d7 Fix markdown link in service-create reference docs 
Markdown nested in a HTML table doesn't work, so changing
the link to a plain HTML link.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6b6511f191
Component: cli
 2017-10-05 12:17:40 +02:00
Vincent Demeester
d9d9c820a9 Merge pull request #599 from friederbluemle/fix-github-spelling 
Fix GitHub spelling
Upstream-commit: 472fcca185
Component: cli
 2017-10-05 09:39:39 +02:00
Frieder Bluemle
ab0a17f568 Fix GitHub spelling 
Signed-off-by: Frieder Bluemle <frieder.bluemle@gmail.com>
Upstream-commit: 45c9b9b6c1
Component: cli
 2017-10-05 01:14:31 +08:00
Sebastiaan van Stijn
669254d0fe Merge pull request #568 from matt9ucci/DockerCompletion 
Add link to DockerCompletion for PowerShell
Upstream-commit: f7ef79228e
Component: cli
 2017-10-03 21:50:58 +02:00
Brian Goff
7d7cb9a4d0 Merge pull request #593 from thaJeztah/add-create-output 
Add output for "secrets" and "configs" on stack deploy
Upstream-commit: 1367fc1114
Component: cli
 2017-10-03 11:06:04 -04:00
Daniel Nephin
cbaa579597 Merge pull request #594 from thaJeztah/remove-deprecated-error-check 
Remove use of deprecated IsErr...NotFound checks
Upstream-commit: daafdf3d84
Component: cli
 2017-10-03 10:30:55 -04:00
Sebastiaan van Stijn
fdd1bd7910 Add output for "secrets" and "configs" on stack deploy 
When deploying a stack from a compose file, the output did not show
that a secret or config was created. This patch adds messages for these.

Create a configuration file and compose file:

    $ cat > config.yml <<EOF
    hello: world
    EOF

    $ cat > secret.txt <<EOF
    p@ssw0rd
    EOF

    $ cat > docker-compose.yml <<EOF
    version: "3.3"
    services:
       test:
         image: nginx:alpine
         configs:
         - source: myconfig
           target: /my-config.yml
         secrets:
         - source: mysecret
           target: /my-secret.txt
    configs:
      myconfig:
        file: ./config.yml
    secrets:
      mysecret:
        file: ./secret.txt
    EOF

Before this patch is applied:

    $ docker stack deploy -c docker-compose.yml example
    Creating network example_default
    Creating service example_test

After this patch is applied:

    $ docker stack deploy -c docker-compose.yml example
    Creating network example_default
    Creating secret example_mysecret
    Creating config example_myconfig
    Creating service example_test

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a5113f4368
Component: cli
 2017-10-03 15:13:10 +02:00
Sebastiaan van Stijn
338d1dac66 Remove use of deprecated IsErr...NotFound checks 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 532a3942d6
Component: cli
 2017-10-03 12:01:24 +02:00
Vincent Demeester
9aa431ea90 Merge pull request #560 from dnephin/fix-bind-mount-named-pipe-compose 
Support parsing of named pipes for compose volumes
Upstream-commit: 448d56a491
Component: cli
 2017-10-03 09:29:13 +02:00
Daniel Nephin
d52520c4a7 Merge pull request #579 from thaJeztah/dont-trunc-on-quiet 
Do not truncate ID on docker service ps --quiet
Upstream-commit: adfc2d17a0
Component: cli
 2017-10-02 10:33:23 -04:00
Vincent Demeester
5f75b4dbc3 Merge pull request #578 from thaJeztah/bump-tonistiigi-fsutil 
vendor tonistiigi/fsutil to dea3a0da73aee887fc02142d995be764106ac5e2
Upstream-commit: 63b795e71f
Component: cli
 2017-10-02 11:00:11 +02:00
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
Sebastiaan van Stijn
1c031cd7d9 vendor tonistiigi/fsutil to dea3a0da73aee887fc02142d995be764106ac5e2 
removes the stevvooe/continuity dependency, which has moved to
containerd/continuity.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 197842fd45
Component: cli
 2017-09-30 18:26:02 +02:00
Sebastiaan van Stijn
e3c5bf234d Merge pull request #577 from stevvooe/allocate-channel 
cli/command/container: ensure channel is allocated
Upstream-commit: 583015b896
Component: cli
 2017-09-30 12:33:40 +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
b92094248e Merge pull request #576 from thaJeztah/bump-version 
Bump version to 17.11.0-dev
Upstream-commit: b75be206d0
Component: cli
 2017-09-30 01:10:00 +02: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
0b195d3e47 Merge pull request #571 from thaJeztah/bump-vndr 
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
Upstream-commit: 107f6c6ab2
Component: cli
 2017-09-29 17:39:21 +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
Matt Gucci
c90aa1161d Add link to DockerCompletion for PowerShell 
Signed-off-by: Masatoshi Higuchi <matt9ucci@gmail.com>
Upstream-commit: f7dfc946fe
Component: cli
 2017-09-29 17:04:33 +09:00
Daniel Nephin
5fe53bab44 Merge pull request #565 from thaJeztah/change-stats-format 
Change default stats format and add --no-trunc flag
Upstream-commit: 64d5c32b8e
Component: cli
 2017-09-28 15:14:43 -04: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
Vincent Demeester
5a67fa7a37 Merge pull request #563 from riyazdf/remove-extra-options 
trust: remove extraneous OPTIONS from commands that do not use it
Upstream-commit: e27e07a8a9
Component: cli
 2017-09-27 09:41:33 +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
Daniel Nephin
7125e1b239 Support parsing of named pipes for compose volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9f73b8c718
Component: cli
 2017-09-26 11:24:23 -04: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
Victor Vieux
1608188995 Merge pull request #472 from riyazdf/docker-trust 
docker trust: view, revoke, sign subcommands (experimental)
Upstream-commit: af3cdccf52
Component: cli
 2017-09-25 17:26:52 -07: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