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

40 Commits

Author SHA1 Message Date
Victor Vieux 85a65c7536 Merge pull request #27564 from mlaventure/add-networks-format-to-ps 
Add Networks placeholder to ps --format
 2016-10-20 18:43:46 -07:00
Kenfe-Mickael Laventure 08ac5a3039 Add Networks placeholder to ps --format 
Passing {{.Networks}} to the format parameter will prompt ps to
display all the networks the container is connected to.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-20 07:41:56 -07:00
Jonh Wendell a528b05dab Exec: Add ability to set environment variables 
Keeping the current behavior for exec, i.e., inheriting
variables from main process. New variables will be added
to current ones. If there's already a variable with that
name it will be overwritten.

Example of usage: docker exec -it -e TERM=vt100 <container> top

Closes #24355.

Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com>
 2016-10-19 12:39:25 -02:00
Justin Cormack 879b4d1fba Merge pull request #27476 from yuexiao-wang/fix-typos-volume 
Fix some typos
 2016-10-18 13:50:20 +01:00
Justin Cormack d52f04b7c1 Merge pull request #27478 from allencloud/wrap-line-in-deleted-containers 
wrap line in deleted containers when pruning
 2016-10-18 13:48:44 +01:00
yuexiao-wang 24d0191a3a Fix typs from go to Go 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-18 19:40:16 +08:00
allencloud 093072cc18 wrap line in deleted containers when pruning 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-18 14:20:12 +08:00
Yong Tang c424fb0e3d 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>
 2016-10-17 12:53:35 -07:00
Sebastiaan van Stijn bfe16dcfe2 Merge pull request #26819 from ripcurld00d/fix_stats_mutex 
Hide the mutex lock in formatter.ContainerStats
 2016-10-13 17:38:22 -07:00
Boaz Shuster 3bc50c45ba 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>
 2016-10-10 21:52:53 +03:00
allencloud 871b692833 better prune and system df 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-11 00:42:21 +08:00
Sebastiaan van Stijn 0c6d66b89a Merge pull request #26778 from WeiZhang555/parallel-operations 
Support parallel kill,rm
 2016-10-10 18:31:10 +02:00
yuexiao-wang 80bc917226 Add the OPTIONS and Fix the links for contain prune 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-11 00:13:33 +08:00
Kenfe-Mickael Laventure 6f8bb41ecb Add subcommand prune to the container, volume, image and system commands 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-29 07:42:53 -07:00
Zhang Wei 5c1362ce59 Support parallel rm 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-28 12:07:18 +08:00
Zhang Wei f612b93d33 Support parallel kill 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-28 12:03:19 +08:00
Josh Horwitz d700b90576 Refactor to new events api 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
 2016-09-22 14:42:06 -04:00
Daniel Nephin 685613f6c9 Merge pull request #24987 from ripcurld00d/stats_format_prod 
Add format to stats
 2016-09-21 10:38:21 -04:00
John Howard 1385ad8b00 Revert Box from HostConfig 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-20 12:01:04 -07:00
Sebastiaan van Stijn 889980d6e3 Merge pull request #26579 from Microsoft/jjh/ociprocess 
Windows: OCI `process` struct and console size to uint
 2016-09-19 22:52:16 +02:00
John Howard f14f7711e7 Windows: OCI process struct convergence 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-19 10:34:31 -07:00
Daniel Nephin 1f0f7ecb5a 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>
 2016-09-19 13:28:15 -04:00
Daniel Nephin accc5d5bd4 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>
 2016-09-19 13:28:02 -04:00
Boaz Shuster a4f3442403 Add the format switch to the stats command 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2016-09-18 14:16:13 +03:00
John Howard c323878331 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 11:56:15 -07:00
Daniel Nephin 2f8c4333fe Fix testcases that expect trailing whitespace 
and broken integration tests based of nil pointers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-13 17:58:12 -04:00
Daniel Nephin db0952ad22 Refactor formatter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-13 17:58:12 -04:00
Daniel Nephin d9cb421d69 Use opts.FilterOpt for filter flags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-13 16:20:10 -04:00
Daniel Nephin 62f513507e Merge pull request #24761 from WeiZhang555/parallel-stop 
Enhancement: allow parallel stop, pause, unpause
 2016-09-13 10:46:51 -04:00
Zhang Wei 4570bfe8de Add parallel operation support for pause/unpause 
Support parallel pause/unpause

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-13 11:01:28 +08:00
Zhang Wei 285fef282f 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>
 2016-09-13 10:50:55 +08:00
Antonio Murdaca aabe9468aa Merge pull request #26456 from dnephin/move_cli_command_registry 
Remove registry/auth helper methods from the DockerCLI object
 2016-09-12 15:11:04 +02:00
Vincent Demeester 2dc3e0341b Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits 
Restrict size to 2 fractional digits for `docker images`
 2016-09-10 11:32:45 +02:00
Daniel Nephin a26ba0e702 Remove remaining registry methods from DockerCLI. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-09 15:50:01 -04:00
Phil Estes 5fe882a494 Merge pull request #22049 from boucher/docker-checkpoint-restore 
Implement containerd API for checkpoints
 2016-09-09 13:36:55 -04:00
Daniel Nephin 0cf85349f3 Move image trust related cli methods into the image package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-09 10:50:16 -04:00
boucher f0647193dc Initial implementation of containerd Checkpoint API. 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:52 -04:00
Yong Tang c68bb57959 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>
 2016-09-08 18:26:50 -07:00
Daniel Nephin e2f7387906 Fix a test that expects whitespace at the end of the line. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:50:14 -04:00
Daniel Nephin 3bd1eb4b76 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>
 2016-09-08 15:46:29 -04:00