toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,130 Commits 3 Branches 295 Tags
5bd9457743f8fa2cedb59ef9bb87d61e3be62fef
Commit Graph
83 Commits
Author SHA1 Message Date
Yong Tang 15c4940651 Update docker stop and docker restart to allow not specifying timeout and use the one specified at container creation time. 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cc703784f39fb3f585ec685cf7aeda6410648446
Component: engine
 2016-10-17 12:53:35 -07:00
Sebastiaan van Stijn 128dd03e48 Merge pull request #26819 from ripcurld00d/fix_stats_mutex 
Hide the mutex lock in formatter.ContainerStats
Upstream-commit: ba2c13fcf55a69a67a861be6fa39a7def803f631
Component: engine
 2016-10-13 17:38:22 -07:00
Boaz Shuster 3cabe08abe Hide the mutex in formatter.ContainerStats 
The formatter.ContainerStats struct exposes its Mutex.
This is a bad design and should be fixed.

To fix that, I separated the statistics
attributes from ContainerStats to StatsEntry and
hid the mutex. Notice that the mutex protects both
the `err` field and the statistics attributes.

Then, implemented SetStatistics, SetError, GetStatistics
and GetError to avoid races.

Moreover, to make this less granular, I decided to
replace the read-write mutex with the regular mutex and
to pass a StatsEntry slice to formatter.ContainerStatsWrite

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 929a77b814dfe9ab7a11bffc2d16eebd27bd903a
Component: engine
 2016-10-10 21:52:53 +03:00
allencloud 5f64850ff1 better prune and system df 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: fd62b6c9505451670b926216648ab7f6a3f9f586
Component: engine
 2016-10-11 00:42:21 +08:00
Sebastiaan van Stijn 1c78e3518f Merge pull request #26778 from WeiZhang555/parallel-operations 
Support parallel kill,rm
Upstream-commit: 2f12d2808464dcfdf45e0920fd508ce0ff12bd29
Component: engine
 2016-10-10 18:31:10 +02:00
yuexiao-wang 216da195bc Add the OPTIONS and Fix the links for contain prune 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6396c62fdc5355ff097da6a131cb176a5f521470
Component: engine
 2016-10-11 00:13:33 +08:00
Kenfe-Mickael Laventure 5cfd36294b Add subcommand prune to the container, volume, image and system commands 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 280c8723667af385e0807a090ddc5cc57c46807e
Component: engine
 2016-09-29 07:42:53 -07:00
Zhang Wei 4377b5b439 Support parallel rm 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 2b773257e0ee45db2c413774a3affae01c7996c1
Component: engine
 2016-09-28 12:07:18 +08:00
Zhang Wei 8de7862f74 Support parallel kill 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: d2bb3aba7edd17df02450385ae378dc70907c449
Component: engine
 2016-09-28 12:03:19 +08:00
Josh Horwitz 7acfbc2634 Refactor to new events api 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: d6bd79c18f5ab5dbdaa472ccd921ad2858117507
Component: engine
 2016-09-22 14:42:06 -04:00
Daniel Nephin ba3ea763a4 Merge pull request #24987 from ripcurld00d/stats_format_prod 
Add format to stats
Upstream-commit: c0699cd4a43ccc3b1e3624379e46e9ed94f7428c
Component: engine
 2016-09-21 10:38:21 -04:00
John Howard 7b0a3056fd Revert Box from HostConfig 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6b74e2f09dfe2627cd639d683e0896b938f38313
Component: engine
 2016-09-20 12:01:04 -07:00
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 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
Boaz Shuster 0fb374bbbf Add the format switch to the stats command 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 96622b2a7d58d74883bc1777d3be171c2b8f2165
Component: engine
 2016-09-18 14:16:13 +03: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
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
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
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
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
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
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 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 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