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

252 Commits

Author SHA1 Message Date
Stephen J Day e78772af4d
cli/command/container: ensure channel is allocated 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-09-29 18:12:03 -07:00
Sebastiaan van Stijn 0082310aa5
Fixes for updated dependencies 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-09-29 17:45:31 +02:00
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
Daniel Nephin 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
Simon Ferquel a0113c3a44 updated vendoring 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-09-01 19:41:06 -04:00
Daniel Nephin a0d8d80250 Fix crash in containe run after pulling an image. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-31 17:08:02 -04:00
Victor Vieux 8ea02f6f08 Merge pull request #477 from dnephin/some-tests-for-container-command 
A few tests for container command
 2017-08-30 09:38:38 -07:00
Daniel Nephin e7f90b6b38 Reduce complexity in cli/command/container 
Add tests for exec and cleanup existing tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-29 19:25:50 -04:00
Daniel Nephin dae1b7112c Remove test for code not in this repo. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-29 13:19:28 -04:00
Vincent Demeester 8ebc03a71f Merge pull request #367 from kolyshkin/ipcmode 
Introduce/document new IPC modes
 2017-08-25 09:48:00 +02:00
Daniel Nephin 846a31aa50 Use new internal testutil.ErrorContains() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 10:14:25 -04:00
Daniel Nephin b3f843afe2 Move internal/test package out of cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 10:14:25 -04: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
Vincent Demeester a6800f95fa
Import `docker/docker/pkg/templates` to cli 
This package will be deprecated/removed from `docker/docker/pkg` and
is mainly used for the cli format options. Let's import it and
maintain here.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-08-08 17:26:24 +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
Daniel Nephin 42a3800783 Update some tests to remove unnecessary buffers. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 17:52:43 -04:00
Daniel Nephin 3da0cbfdd1 Remove unnecessary use of SetConfigfile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 14:49:30 -04:00
Daniel Nephin 69b142b52a Update FakeCli to remove duplication in tests. 
Use byte buffers by default, since that is what is done most of the time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-11 14:49:30 -04:00
Yassine TIJANI 45b0e7cf1a fixing SIGSEGV when running containers 
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>

moving the deffering of the close after the error checking

Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>

fixing SIGSEGV when running containers

Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
 2017-07-06 18:57:36 +02:00
Daniel Nephin 732261f774 Use compose volume spec parser for container volume flag 
Restore testcases for Volume spec parsing.
And correctly interpret the parsed volume.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-21 11:16:04 -04:00
Brian Goff 2bfac7fcda Merge pull request #176 from dnephin/new-lint 
New linters
 2017-06-20 16:47:45 -07:00
Dave Tucker 35f1e301b5 Allow Proxy Configuration in config.json 
This commit modifies config.json to allow for any proxies allowed in
build-args to be configured. These values will then be used
by default as build-args in docker build.

Signed-off-by: Dave Tucker <dt@docker.com>
 2017-06-20 09:51:41 +01:00
Daniel Nephin 3724fb7f37 Add gosimple lint 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-14 16:55:08 -07:00
Daniel Nephin 3e3934c19f Add unparam linter 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-14 16:55:08 -07:00
Daniel Nephin a712993e93 Add misspell lint 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-14 16:54:27 -07:00
Daniel Nephin 01e1e58ada Add unused linter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-14 16:54:27 -07:00
Vincent Demeester 4ffefe4a1f Merge pull request #115 from jsoref/spelling 
Spelling
 2017-06-14 09:58:55 +02:00
Sebastiaan van Stijn ab3ea637b6 Merge pull request #111 from keloyang/attach-restarting-check 
Add a restarting check to runAttach
 2017-06-08 12:53:15 +02:00
Shukui Yang 90f497302f Add a restarting check to runAttach 
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
 2017-06-08 07:12:39 +08:00
Shukui Yang e8cc2cf760 Replace command.DockerCli to command.Cli in docker attach/exec command 
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
 2017-06-08 07:03:52 +08:00
Vincent Demeester 44ac80881f
Update vendoring of docker/docker 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-06 00:23:21 +02:00
Sebastiaan van Stijn 61c0b9f78d Merge pull request #102 from keloyang/attach-block 
Recheck the container's state to avoid attach block.
 2017-05-24 12:09:38 +01:00
Josh Soref 70a9905ee5 Spelling fixes 
* appropriate
* assumption
* attach
* because
* building
* customized
* mapping
* propagated

Signed-off-by: Josh Soref <jsoref@gmail.com>
 2017-05-22 01:39:06 +00:00
Shukui Yang f9dc3337f9 Recheck the container's state to avoid attach block. 
If use docker attach command to attach to a stop container, it will return
"You cannot attach to a stopped container" error, it's ok, but when
attach to a running container, it(docker attach) use inspect to check
the container's state, if it pass the state check on the client side,
and then the container is stopped, docker attach command still attach to
the container and not exit.

Signed-off-by: Shukui Yang <yangshukui@huawei.com>
 2017-05-20 08:02:06 +08:00
Sebastiaan van Stijn 85c2330dfa Merge pull request #80 from AkihiroSuda/adjust-docker-stats 
[Carry moby/moby#32777] Adjusted docker stats memory output
 2017-05-18 01:55:52 +02:00
Josh Hawn 6eca53c7ae Refactor holdHijackedConnection 
It has been refactored to a hijackedIOStreamer type which has several
methods which are used to prepare input and handle streaming the input
and output separately.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2017-05-17 15:18:01 -07:00
Josh Hawn 38591f20d0 Update CLI package with containerWait changes 
The docker/client package was updated to support the updated Container
Wait API functionality. The run and start commands have been updated to
use the new wait features.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2017-05-17 11:44:54 -07:00
Akihiro Suda 3c78bc775c Fix float64 comparison in stats_helpers_test.go 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-16 02:13:00 +00:00
Sergey Tryuber 82600b7021 Adjusted docker stats memory output 
Signed-off-by: Sergey Tryuber <Sergeant007@users.noreply.github.com>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-16 02:00:47 +00:00
Vincent Demeester d7f6563efc
Update cli imports to using local package 
Also, rename a bunch of variable to not *shadow* the `opts` package
name.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-15 14:45:19 +02:00
Aleksa Sarai ee7a956c54
client: check tty before creating exec job 
This is necessary in order to avoid execId leaks in the case where a
`docker exec -it` is run without a terminal available for the client.
You can reproduce this issue by running the following command many
times.

  % nohup docker exec -it some_container true

The container `some_container` will have execIDs that will never
normally be cleaned up (because the client died before they were
started).

In addition, this patch adds a docker-inspect step to ensure that we
give "container does not exist" errors consistently.

Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2017-05-09 21:07:40 +10:00
Daniel Nephin c31d25653f Add line length linter 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-08 15:57:56 -04:00
Daniel Nephin 37ccc00d0e Add interfacer linter 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-08 15:57:50 -04:00
Gaetan de Villele 295140edf2 cli: gofmt + goimports 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2017-05-08 10:51:30 -07:00
Tibor Vass 57230a7212 rm client and vendor it instead 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-05-08 10:33:56 -07:00
Dong Chen a316b380e7 do not allow duration less than 1 ms in healthcheck parameters 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2017-05-03 17:46:40 -07:00
Antonio Murdaca dea809813e remove --init-path from client 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-05-03 17:46:39 -07:00
Daniel Nephin 08af0f28c5 Add gocycle lint 
Whitelist some existing offenders, and use a high limit for now.
This limit should decrese over time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-02 17:57:46 -04:00
Daniel Nephin 690ef8af79 Enable golint 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-02 17:57:46 -04:00
Daniel Nephin e3f677794a Add gometalinter to CI 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-02 17:15:56 -04:00
Daniel Nephin 10641c2aae Update imports. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-17 18:07:56 -04:00
Daniel Nephin 1630fc40f8 Import docker/docker/cli 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-04-17 17:40:59 -04:00