yupeng
4cd3911d13
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 7113bbf2c6
2016-11-08 14:51:17 +08:00
Victor Vieux
75f0b0b043
update cobra and use Tags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 1e10649f55
2016-11-04 12:04:14 -07:00
Victor Vieux
25608ce8d4
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eb522dac24
2016-11-03 17:31:12 -07:00
Victor Vieux
a3d3423005
fix double [y/N] in container prune
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 3014d36cd9
2016-11-03 10:33:17 -07:00
Sebastiaan van Stijn
7caa97e5c7
Merge pull request #27948 from WeiZhang555/consistent-filters
...
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: 81e6e5e36d
2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn
bee99c14d9
Merge pull request #27864 from vdemeester/add-statsformat-to-configfile
...
Add StatsFormat to the config.json file
Upstream-commit: 63719e1a24
2016-11-01 20:32:13 -07:00
Zhang Wei
ca8b6d0b28
Replace all "Filter" field with "Filters" for consistency
...
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 9eceaa926f
2016-11-01 23:09:30 +08:00
Daniel Nephin
5175d100a2
Generate container create response from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7e0837702
2016-10-31 11:16:02 -04:00
Vincent Demeester
e527c56131
Add StatsFormat to the config.json file
...
As for `ps`, `images`, `network ls` and `volume ls`, this makes it
possible to define a custom default format.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 908aa5b408
2016-10-28 11:48:25 -07:00
boucher
5099913cf9
Allow providing a custom storage directory for docker checkpoints
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: 5ddcbc3c00
2016-10-28 07:56:05 -04:00
Sebastiaan van Stijn
38aff80fff
Merge pull request #27759 from Microsoft/jjh/fixstats
...
Windows: Fix stats CLI
Upstream-commit: 3b4084cb50
2016-10-26 18:17:18 -07:00
Erik St. Martin
46742b9fba
Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
...
containers may specify these cgroup values at runtime. This will allow
processes to change their priority to real-time within the container
when CONFIG_RT_GROUP_SCHED is enabled in the kernel. See #22380 .
Also added sanity checks for the new --cpu-rt-runtime and --cpu-rt-period
flags to ensure that that the kernel supports these features and that
runtime is not greater than period.
Daemon will support a --cpu-rt-runtime flag to initialize the parent
cgroup on startup, this prevents the administrator from alotting runtime
to docker after each restart.
There are additional checks that could be added but maybe too far? Check
parent cgroups to ensure values are <= parent, inspecting rtprio ulimit
and issuing a warning.
Signed-off-by: Erik St. Martin <alakriti@gmail.com >
Upstream-commit: 4f320d7c2a
2016-10-26 11:33:06 -04:00
John Howard
84e8a755f4
Windows: Fix stats CLI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dff7842790
2016-10-25 19:57:47 -07:00
Kenfe-Mickael Laventure
2451915c27
Make experimental a runtime flag
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 66bd963b76
2016-10-24 15:20:01 -07:00
Victor Vieux
fe241a941a
Merge pull request #27564 from mlaventure/add-networks-format-to-ps
...
Add Networks placeholder to ps --format
Upstream-commit: 85a65c7536
2016-10-20 18:43:46 -07:00
Kenfe-Mickael Laventure
b2507ea973
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 >
Upstream-commit: 08ac5a3039
2016-10-20 07:41:56 -07:00
Jonh Wendell
3a00f9dfc7
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 >
Upstream-commit: a528b05dab
2016-10-19 12:39:25 -02:00
Justin Cormack
cb9c9cdbfa
Merge pull request #27476 from yuexiao-wang/fix-typos-volume
...
Fix some typos
Upstream-commit: 879b4d1fba
2016-10-18 13:50:20 +01:00
Justin Cormack
1f163ad243
Merge pull request #27478 from allencloud/wrap-line-in-deleted-containers
...
wrap line in deleted containers when pruning
Upstream-commit: d52f04b7c1
2016-10-18 13:48:44 +01:00
yuexiao-wang
655c82e562
Fix typs from go to Go
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 24d0191a3a
2016-10-18 19:40:16 +08:00
allencloud
52dbab66cb
wrap line in deleted containers when pruning
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 093072cc18
2016-10-18 14:20:12 +08:00
Yong Tang
a195f2d433
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: c424fb0e3d
2016-10-17 12:53:35 -07:00
Sebastiaan van Stijn
17ee92cc91
Merge pull request #26819 from ripcurld00d/fix_stats_mutex
...
Hide the mutex lock in formatter.ContainerStats
Upstream-commit: bfe16dcfe2
2016-10-13 17:38:22 -07:00
Boaz Shuster
1c68035702
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: 3bc50c45ba
2016-10-10 21:52:53 +03:00
allencloud
b9c5442c91
better prune and system df
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 871b692833
2016-10-11 00:42:21 +08:00
Sebastiaan van Stijn
879f289e5a
Merge pull request #26778 from WeiZhang555/parallel-operations
...
Support parallel kill,rm
Upstream-commit: 0c6d66b89a
2016-10-10 18:31:10 +02:00
yuexiao-wang
7f7622756e
Add the OPTIONS and Fix the links for contain prune
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 80bc917226
2016-10-11 00:13:33 +08:00
Kenfe-Mickael Laventure
c80b266f91
Add subcommand prune to the container, volume, image and system commands
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6f8bb41ecb
2016-09-29 07:42:53 -07:00
Zhang Wei
cf39dde222
Support parallel rm
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 5c1362ce59
2016-09-28 12:07:18 +08:00
Zhang Wei
03427eb002
Support parallel kill
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: f612b93d33
2016-09-28 12:03:19 +08:00
Josh Horwitz
37441dedaa
Refactor to new events api
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: d700b90576
2016-09-22 14:42:06 -04:00
Daniel Nephin
79df3ddbda
Merge pull request #24987 from ripcurld00d/stats_format_prod
...
Add format to stats
Upstream-commit: 685613f6c9
2016-09-21 10:38:21 -04:00
John Howard
e5fc4c58fb
Revert Box from HostConfig
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1385ad8b00
2016-09-20 12:01:04 -07:00
Sebastiaan van Stijn
3deff1380d
Merge pull request #26579 from Microsoft/jjh/ociprocess
...
Windows: OCI `process` struct and console size to uint
Upstream-commit: 889980d6e3
2016-09-19 22:52:16 +02:00
John Howard
1652332026
Windows: OCI process struct convergence
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f14f7711e7
2016-09-19 10:34:31 -07:00
Daniel Nephin
a765266b0a
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: 1f0f7ecb5a
2016-09-19 13:28:15 -04:00
Daniel Nephin
5ae46f25cb
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: accc5d5bd4
2016-09-19 13:28:02 -04:00
Boaz Shuster
a8c10a8cb0
Add the format switch to the stats command
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: a4f3442403
2016-09-18 14:16:13 +03:00
John Howard
25db3b26a7
Windows: stats support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c323878331
2016-09-16 11:56:15 -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
2016-09-13 17:58:12 -04:00
Daniel Nephin
91cf73d819
Refactor formatter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: db0952ad22
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
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
2016-09-13 10:46:51 -04: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
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
2016-09-13 10:50:55 +08: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
2016-09-12 15:11:04 +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
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
2016-09-09 15:50:01 -04:00
Phil Estes
e71d793ff1
Merge pull request #22049 from boucher/docker-checkpoint-restore
...
Implement containerd API for checkpoints
Upstream-commit: 5fe882a494
2016-09-09 13:36:55 -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
2016-09-09 10:50:16 -04:00
yupeng
Victor Vieux
Sebastiaan van Stijn
Zhang Wei
Daniel Nephin
Vincent Demeester
boucher
Erik St. Martin
John Howard
Kenfe-Mickael Laventure
Victor Vieux
Jonh Wendell
Justin Cormack
yuexiao-wang
allencloud
Yong Tang
Boaz Shuster
Josh Horwitz
Daniel Nephin
Antonio Murdaca
Phil Estes