Commit Graph
4131 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 2eba4524b4 Merge pull request #26268 from AkihiroSuda/eventsjsonl
add `docker events --format`
Upstream-commit: a151a36595
Component: cli
2016-09-19 17:30:27 +02:00
Boaz Shuster a8c10a8cb0 Add the format switch to the stats command
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: a4f3442403
Component: cli
2016-09-18 14:16:13 +03:00
John Howard b2e202046b Merge pull request #25737 from Microsoft/jjh-statistics
Windows: Add support for docker stats
Upstream-commit: 41b980ad6d
Component: cli
2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn 21a5ca1831 Merge pull request #26387 from Microsoft/jjh/securityopts
Only output security options if there are any
Upstream-commit: 3fc784d460
Component: cli
2016-09-16 23:05:30 +02:00
John Howard f35e1280b5 Windows: stats support
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 86c86fc166
Component: cli
2016-09-16 11:56:15 -07:00
John Howard 25db3b26a7 Windows: stats support
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c323878331
Component: cli
2016-09-16 11:56:15 -07:00
John Howard 0e8c716b08 Only output security options if there are any
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d0e960f3b1
Component: cli
2016-09-16 10:05:21 -07:00
Akihiro Suda 85c46768d0 add docker events --format
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 0ae2a02ce6
Component: cli
2016-09-15 09:55:29 +00:00
allencloud b8d8e583b4 correct some nits in comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: acb1fc424b
Component: cli
2016-09-15 12:17:58 +08:00
Yong Tang 473fb49310 Check bad syntax on dockerfile before building.
This fix tries to address the issue raised in 26453 where bad syntax
on dockerfile is not checked before building, thus user has to wait
before seeing error in dockerfile.

This fix fixes the issue by evaluating all the instructions and check
syntax before dockerfile is invoked actually.

All existing tests pass.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 824707ea49
Component: cli
2016-09-13 21:43:10 -07:00
Daniel Nephin a43858a79d Fix testcases that expect trailing whitespace
and broken integration tests based of nil pointers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2f8c4333fe
Component: cli
2016-09-13 17:58:12 -04:00
Daniel Nephin 91cf73d819 Refactor formatter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: db0952ad22
Component: cli
2016-09-13 17:58:12 -04:00
Daniel Nephin d9c3f096cf Use opts.FilterOpt for filter flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d9cb421d69
Component: cli
2016-09-13 16:20:10 -04:00
Daniel Nephin 5a7dfca796 Merge pull request #24761 from WeiZhang555/parallel-stop
Enhancement: allow parallel stop, pause, unpause
Upstream-commit: 62f513507e
Component: cli
2016-09-13 10:46:51 -04:00
Yong Tang 7fb726de4d 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: 9aba07679f
Component: cli
2016-09-12 23:08:19 -07:00
Zhang Wei 24c19a8d47 Add parallel operation support for pause/unpause
Support parallel pause/unpause

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 4570bfe8de
Component: cli
2016-09-13 11:01:28 +08:00
Zhang Wei 45c490c19f 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: 285fef282f
Component: cli
2016-09-13 10:50:55 +08:00
Brian Goff ee44344b08 Merge pull request #26103 from sakeven/fix-validate-build-arg
validate build-arg
Upstream-commit: d23d33781a
Component: cli
2016-09-12 09:15:58 -04:00
Antonio Murdaca c4973b1822 Merge pull request #26456 from dnephin/move_cli_command_registry
Remove registry/auth helper methods from the DockerCLI object
Upstream-commit: aabe9468aa
Component: cli
2016-09-12 15:11:04 +02:00
sakeven 4f7aafa408 validate build-arg
Signed-off-by: sakeven <jc5930@sina.cn>
Upstream-commit: f39b39cccb
Component: cli
2016-09-12 18:02:21 +08:00
Vincent Demeester b87d5047a3 Add a README to the client's package…
… taken from the old engine-api project.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 62e14c713b
Component: cli
2016-09-12 11:41:11 +02:00
Vincent Demeester 8f50e93ae4 Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 2dc3e0341b
Component: cli
2016-09-10 11:32:45 +02:00
Daniel Nephin 3c8785422e Remove remaining registry methods from DockerCLI.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a26ba0e702
Component: cli
2016-09-09 15:50:01 -04:00
Daniel Nephin 5a9c815672 Remove cli/command/credentials
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4ae4e66e3c
Component: cli
2016-09-09 15:50:01 -04:00
Daniel Nephin b9ca23a598 Remove RetrieveAuthConfigs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ed55f00674
Component: cli
2016-09-09 15:50:01 -04:00
Stephen J Day 291889bdac tlsconfig: move Clone into proper package
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: c6f96cb8b4
Component: cli
2016-09-09 12:05:17 -07:00
allencloud d47523d4c5 support docker node ps multiNodes
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6df46463a9
Component: cli
2016-09-10 02:52:48 +08:00
Phil Estes e71d793ff1 Merge pull request #22049 from boucher/docker-checkpoint-restore
Implement containerd API for checkpoints
Upstream-commit: 5fe882a494
Component: cli
2016-09-09 13:36:55 -04:00
boucher e0e6966e2d Update checkpoint comments to be more accurate
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 272868566b
Component: cli
2016-09-09 12:13:46 -04:00
Daniel Nephin bea6567477 Move image trust related cli methods into the image package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0cf85349f3
Component: cli
2016-09-09 10:50:16 -04:00
boucher 46699a2a41 Fix typo
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 9524caa317
Component: cli
2016-09-08 21:31:56 -04:00
boucher cef9a66721 Initial implementation of containerd Checkpoint API.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: f0647193dc
Component: cli
2016-09-08 21:31:52 -04:00
Yong Tang 9c57f9b583 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: c68bb57959
Component: cli
2016-09-08 18:26:50 -07:00
Stephen J Day 92630b8067 client: don't hide context errors
Instead of reformatting error from the request action, we wrap it,
allowing the cause to be recovered. This is important for consumers that
need to be able to detect context errors, such as `Cancelled` and
`DeadlineExceeded`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 450b3123e3
Component: cli
2016-09-08 17:47:43 -07:00
Daniel Nephin b924adb986 Fix a test that expects whitespace at the end of the line.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e2f7387906
Component: cli
2016-09-08 15:50:14 -04:00
Daniel Nephin bc178aeaa8 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: 8f3e3fb6e5
Component: cli
2016-09-08 15:46:48 -04:00
Daniel Nephin a5bf28b72a 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: b2c77abc35
Component: cli
2016-09-08 15:46:29 -04:00
Daniel Nephin 964a552e76 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: 3bd1eb4b76
Component: cli
2016-09-08 15:46:29 -04:00
Akihiro Suda eb96b2810d client: transport: fix tlsconfig Clone() on different Golang versions
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d675c81577
Component: cli
2016-09-08 17:55:54 +00:00
Michael Crosby f7bdcb1297 Move engine-api client package
This moves the engine-api client package to `/docker/docker/client`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 3fff6acaa1
Component: cli
2016-09-07 11:05:58 -07:00
Cao Weiwei f7f411a109 Fix typo
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
Upstream-commit: efdd29abcf
Component: cli
2016-08-28 21:30:14 +08:00
Daniel Nephin c3ab654101 Fix daemon command proxy.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ad96b991e9
Component: cli
2016-08-26 12:19:02 -04:00
Daniel Nephin 29b743a981 Fix tests and windows service.
Support args to RunCommand
Fix docker help text test.
Fix for ipv6 tests.
Fix TLSverify option.
Fix TestDaemonDiscoveryBackendConfigReload
Use tempfile for another test.
Restore missing flag.
Fix tests for removal of shlex.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2791c2ec28
Component: cli
2016-08-25 13:09:36 -04:00
Daniel Nephin e110c778f4 Fix tests and windows service.
Support args to RunCommand
Fix docker help text test.
Fix for ipv6 tests.
Fix TLSverify option.
Fix TestDaemonDiscoveryBackendConfigReload
Use tempfile for another test.
Restore missing flag.
Fix tests for removal of shlex.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9af25060cd
Component: cli
2016-08-25 13:09:36 -04:00
Daniel Nephin 594214abab Remove old cli framework.
Also consolidate the leftover packages under cli.
Remove pkg/mflag.
Make manpage generation work with new cobra layout.
Remove remaining mflag and fix tests after rebase with master.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 38aca22dcd
Component: cli
2016-08-25 13:09:04 -04:00
Daniel Nephin e062c54a99 Remove old cli framework.
Also consolidate the leftover packages under cli.
Remove pkg/mflag.
Make manpage generation work with new cobra layout.
Remove remaining mflag and fix tests after rebase with master.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3b178887a7
Component: cli
2016-08-25 13:09:04 -04:00
Daniel Nephin fbca637dc3 Update unit tests for new cobra root command.
Cleanup cobra integration
Update windows files for cobra and pflags
Cleanup SetupRootcmd, and remove unnecessary SetFlagErrorFunc.
Use cobra command traversal

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fc1a3d79f8
Component: cli
2016-08-25 13:09:04 -04:00
Daniel Nephin 7e9f26ef70 Update unit tests for new cobra root command.
Cleanup cobra integration
Update windows files for cobra and pflags
Cleanup SetupRootcmd, and remove unnecessary SetFlagErrorFunc.
Use cobra command traversal

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 58a14cd18c
Component: cli
2016-08-25 13:09:04 -04:00
Daniel Nephin 93466186ca Convert docker root command to use pflag and cobra
Fix the daemon proxy for cobra commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 82a8cc1556
Component: cli
2016-08-25 13:09:03 -04:00
Daniel Nephin c526dbb69a Convert docker root command to use pflag and cobra
Fix the daemon proxy for cobra commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 08784d7e0e
Component: cli
2016-08-25 13:09:03 -04:00