p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,378 Commits 2 Branches 295 Tags
7330d7eef706b671f0b1107c10b4e8a398203eea
Commit Graph

34 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
62c8ac5cdc Merge pull request #26579 from Microsoft/jjh/ociprocess 
Windows: OCI `process` struct and console size to uint
Upstream-commit: 8c508ef8132ba9b5c3daa411a593349af6d32a33
Component: engine
 2016-09-19 22:52:16 +02:00
John Howard
92d37247b3 Windows: OCI process struct convergence 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 53774423ff0db50cb0934e7b1e5ce507363e8147
Component: engine
 2016-09-19 10:34:31 -07:00
Daniel Nephin
89cbe8e685 Only hide commands if the env variable is set. 
Better formatting for usage template.
Group commands in usage to management/operation commands.
Remove the word Docker from the description of management commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a7c8bcac2ba60d6dd25a1157085d9245bed556ce
Component: engine
 2016-09-19 13:28:15 -04:00
Daniel Nephin
84957d85e8 Move the search command to the registry package. 
And move it back to the top-level command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dda198761b9638ff1a0f5a4522751267d2faca8a
Component: engine
 2016-09-19 13:28:15 -04:00
Daniel Nephin
555894f6f3 Move canonical image and container commands into a command group 
Hide some top level commands
Add docker container and image inspect commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b993609d5ad4590da72e217bb43786b74aabc183
Component: engine
 2016-09-19 13:28:02 -04:00
Sebastiaan van Stijn
14f9dd10a3 Merge pull request #26268 from AkihiroSuda/eventsjsonl 
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
 2016-09-19 17:30:27 +02:00
John Howard
5049c43226 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
 2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
93e3695b69 Merge pull request #26387 from Microsoft/jjh/securityopts 
Only output security options if there are any
Upstream-commit: 94bc2b1bc07843087c0096d06fdb56d70aa45a02
Component: engine
 2016-09-16 23:05:30 +02:00
John Howard
7342ae40e2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
 2016-09-16 11:56:15 -07:00
John Howard
39533df3e9 Only output security options if there are any 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dd3d223a7ea3fc35eeeb255fc97a7bc46936cae5
Component: engine
 2016-09-16 10:05:21 -07:00
Akihiro Suda
e6635a948e add docker events --format 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5af5a1be6209bde3f05b5f9ed4e0db0037dfe0ff
Component: engine
 2016-09-15 09:55:29 +00:00
Daniel Nephin
dd60049ff5 Fix testcases that expect trailing whitespace 
and broken integration tests based of nil pointers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e16e9775d48b6cd0cc7b4a66114d1b9680aa2f31
Component: engine
 2016-09-13 17:58:12 -04:00
Daniel Nephin
d90a93ce88 Refactor formatter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c8336743a47216f87956b77449bd21714d3c45f1
Component: engine
 2016-09-13 17:58:12 -04:00
Daniel Nephin
71b78a5b8d Use opts.FilterOpt for filter flags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a07be9be38a96f43a0a7bac48caf35f9370bb543
Component: engine
 2016-09-13 16:20:10 -04:00
Daniel Nephin
38a7f4f62e Merge pull request #24761 from WeiZhang555/parallel-stop 
Enhancement: allow parallel stop, pause, unpause
Upstream-commit: c2decbe5ee9bd7677699228257db6bcd12d13b78
Component: engine
 2016-09-13 10:46:51 -04:00
Yong Tang
26569691e1 Fix issue of WARNING: --size ignored for volume for docker inspect 
When `docker inspect` is invoked, it is possible to pass a flag of
`-s` for container types to display size information. If `-s` is used
for non-container types then a warning `WARNING: --size ignored for volume`
will show up.

However, currently `WARNING: --size ignored for volume` will show up even
when `-s` is not passed to `docker inspect` for non-container types.

This fix fixes this issue by checking if `-s` has been passed or not (`getSize`).
Also, since image inspect does not support `-s`, `IsSizeSupported` has been changed
to false for images.

This fix is tested manually.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 54976b718feac328609a0323d60f02a28c988f94
Component: engine
 2016-09-12 23:08:19 -07:00
Zhang Wei
6e795d6e5b Add parallel operation support for pause/unpause 
Support parallel pause/unpause

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: f1dda4395eb52eaeca8f9a1c76c2e2c3e6532490
Component: engine
 2016-09-13 11:01:28 +08:00
Zhang Wei
a92bf719a1 Enhancement: allow parallel stop 
Stop multiple containers in parallel to speed up stop process, allow
maximum 50 parallel stops.

Signed-off-by: Abhinav Dahiya <abhinavdtu2012@gmail.com>
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 2155b46915a4df821405d26f576d9fae9fa5178e
Component: engine
 2016-09-13 10:50:55 +08:00
Brian Goff
91d4a22ad9 Merge pull request #26103 from sakeven/fix-validate-build-arg 
validate build-arg
Upstream-commit: e5544fbb0df01e679822352f49adc5c327ca6656
Component: engine
 2016-09-12 09:15:58 -04:00
Antonio Murdaca
61ecf7906c Merge pull request #26456 from dnephin/move_cli_command_registry 
Remove registry/auth helper methods from the DockerCLI object
Upstream-commit: e8b9f38c7e2e249084c78c81f136c6d22432af6f
Component: engine
 2016-09-12 15:11:04 +02:00
sakeven
c169c364de validate build-arg 
Signed-off-by: sakeven <jc5930@sina.cn>
Upstream-commit: 5426510bea290a8eff3842fdc32240ad33cc0ef1
Component: engine
 2016-09-12 18:02:21 +08:00
Vincent Demeester
7e3f0fe810 Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits 
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 4c3f2e7c376c83593188f6548652e9261209c908
Component: engine
 2016-09-10 11:32:45 +02:00
Daniel Nephin
be2034fe8c Remove remaining registry methods from DockerCLI. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1dd46e06444d1a0c73fc88dfccec4ae0b7f10bf6
Component: engine
 2016-09-09 15:50:01 -04:00
Daniel Nephin
4d7122f63b Remove cli/command/credentials 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e05fa5de480b7bf4c16df1624f85ecf96a42b3f7
Component: engine
 2016-09-09 15:50:01 -04:00
Daniel Nephin
bfc42c3a59 Remove RetrieveAuthConfigs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5d335fbda7d32f06c8b3080a79018b9585cb83f1
Component: engine
 2016-09-09 15:50:01 -04:00
Phil Estes
32b3a84313 Merge pull request #22049 from boucher/docker-checkpoint-restore 
Implement containerd API for checkpoints
Upstream-commit: cf58eb437c4229e876f2d952a228b603a074e584
Component: engine
 2016-09-09 13:36:55 -04:00
boucher
f1d86422d0 Update checkpoint comments to be more accurate 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 67f607a02f8e86586f3984c7fd24961deba29b8b
Component: engine
 2016-09-09 12:13:46 -04:00
Daniel Nephin
30f4e29669 Move image trust related cli methods into the image package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e7c9694d76390e9f8a0d1ec3f54c2eda632b3759
Component: engine
 2016-09-09 10:50:16 -04:00
boucher
86bd90005f Fix typo 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: cb0ad4258b4c9615a16960c2a6125d2c40896d3b
Component: engine
 2016-09-08 21:31:56 -04:00
boucher
7bef93723c Initial implementation of containerd Checkpoint API. 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
 2016-09-08 21:31:52 -04:00
Yong Tang
5a872990c6 Restrict size to 2 fractional digits for docker images 
This fix tries to address the issue raised in 26300. Previously
`docker images` will use `HumanSize()` to display the size which
has a fixed precision of 4 (thus 3 fractional digits). This
could be problematic in certain languages (e.g. , German, see
26300) as `.` may be interpreted as thousands-separator in number.

This fix use `CustomSize()` instead and limit the precision to 3
(thus 2 fractional digits).

This fix has been tested manually.

This fix fixes 26300.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4e7e3919cedd2ba6ec5b9a4deb4cab56be460c23
Component: engine
 2016-09-08 18:26:50 -07:00
Daniel Nephin
623bb6a4a8 Fix a test that expects whitespace at the end of the line. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 485881b038eea7b1cee7f94f1e20e4cd3be85c0c
Component: engine
 2016-09-08 15:50:14 -04:00
Daniel Nephin
0238cc6815 Replace api/client imports with cli/command in experimental files. 
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9c2b9358125175db366ca000e6dae9af8dc88e2d
Component: engine
 2016-09-08 15:46:48 -04:00
Daniel Nephin
d8acc366ce Move api/client -> cli/command 
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd
Component: engine
 2016-09-08 15:46:29 -04:00