Commit Graph

65 Commits

Author SHA1 Message Date
d882807966 add \n in engine labels display in docker node inspect xxx --pretty
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 65b1e54c73
Component: cli
2016-09-29 18:17:54 +08:00
4c5ae70968 Merge pull request #24850 from yongtang/24270-service-tasks-filter
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: 5ca7909308
Component: cli
2016-09-28 11:50:27 +02:00
a0d7480769 Merge pull request #26951 from AkihiroSuda/update-ut-cli-command-service
Fix cli/command/service/opts_test.go, and add some extra test cases
Upstream-commit: 715d301f12
Component: cli
2016-09-27 20:30:26 -04:00
459d502275 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: bf824fee21
Component: cli
2016-09-27 18:46:51 +02:00
72959f648d Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
add endpoint mode in service pretty
Upstream-commit: b322c8e506
Component: cli
2016-09-27 18:28:43 +02:00
841efb11eb Fix cli/command/service/opts_test.go, and add some extra test cases
`m.Set("type=volume,target=/foo,volume-nocopy")` is valid even though it lacks "source"

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 2126d8160d
Component: cli
2016-09-27 15:27:02 +00:00
c8b419cfef Let swarmkit handle cluster defaults in swarm init if not specified
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).

This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.

This fix fixes 24958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e0f229d2ca
Component: cli
2016-09-27 04:19:38 -07:00
64b2b3acec add endpoint mode in service pretty
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: cc375fafd0
Component: cli
2016-09-27 18:41:19 +08:00
b83d53e6c9 Fix partial/full filter issue in service tasks --filter
This fix tries to address the issue related to 24108 and 24790, and
also the case from 24620#issuecomment-233715656

The reason for the failure case in the above mentioned issues is that
currently Task names are actually indexed by Service Name
(`e.ServiceAnnotations.Name`)

To fix it, a pull request in swarmkit (swarmkit/pull/1193) has been
opened separately.

This fix adds the integration tests for the above mentioned issues.
Swarmkit revendoring is needed to completely fix the issues.

This fix fixes 24108.
This fix fixes 24790.
This fix is related to 24620.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 2d844ea5c8
Component: cli
2016-09-26 16:01:20 -07:00
671a87f1cb Merge pull request #23886 from AkihiroSuda/stackcli
add `docker stack ls`
Upstream-commit: 53c51901d7
Component: cli
2016-09-26 21:19:04 +02:00
72e91d1a5e Merge pull request #26839 from tonistiigi/build-cache
Implement build cache based on history array
Upstream-commit: dc14c5aa27
Component: cli
2016-09-26 17:31:49 +00:00
505f16cebe cli: Add more nil checking to service pretty-printer
Currently, if the service mode is not "global", this code assumes that
Replicated is non-nil. This assumption may not be true in the future.
Instead of making the assumption, explicitly check that Replicated is
non-nil before using it.

Similarly, for limits and reservations, enclose methods that read from
Limits and Reservations within checks that those fields are non-nil.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 56d92bfdff
Component: cli
2016-09-26 10:12:24 +01:00
127f51b740 Merge pull request #25853 from jhorwit2/jah/event-refactor
Refactor to new engine-api events api 
Upstream-commit: e58c0c6e1b
Component: cli
2016-09-24 11:07:12 +02:00
3d802fdc17 Add isolation to info
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 266b7564a5
Component: cli
2016-09-23 12:13:29 -07:00
09eec7183c Implement build cache based on history array
Based on work by KJ Tsanaktsidis

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
Upstream-commit: fe4cc3fd77
Component: cli
2016-09-23 11:30:06 -07:00
bd30751e22 Merge pull request #26516 from yongtang/26453-build-bad-syntax
Check bad syntax on dockerfile before building.
Upstream-commit: cecd4904f3
Component: cli
2016-09-23 12:24:20 +02:00
b0a2a84ed2 Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
support docker node ps multiNodes
Upstream-commit: e7e32f0465
Component: cli
2016-09-23 09:50:24 +02:00
7883253071 add docker stack ls
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: b06f3f27a4
Component: cli
2016-09-22 19:31:39 +00:00
37441dedaa Refactor to new events api
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: d700b90576
Component: cli
2016-09-22 14:42:06 -04:00
d13d0e9946 Clarify usage of --force when used on a swarm manager
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: bfbdb15f55
Component: cli
2016-09-21 13:05:33 -07:00
79df3ddbda Merge pull request #24987 from ripcurld00d/stats_format_prod
Add format to stats
Upstream-commit: 685613f6c9
Component: cli
2016-09-21 10:38:21 -04:00
e5fc4c58fb Revert Box from HostConfig
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1385ad8b00
Component: cli
2016-09-20 12:01:04 -07:00
341cd5c250 Merge pull request #26716 from dnephin/move-system-commands
Create system  subcommand
Upstream-commit: b7722cd80a
Component: cli
2016-09-20 15:54:01 +02:00
22e1ef020d Merge pull request #25025 from cpuguy83/service_inspect_formatter
Add formatter for service inspect
Upstream-commit: 333a0f348f
Component: cli
2016-09-20 14:49:45 +02:00
98e76e1747 Merge pull request #26717 from dnephin/fix_experimental_commands
Make all the experimental subcommand consistent
Upstream-commit: 4ff733cf1c
Component: cli
2016-09-19 19:29:48 -04:00
3deff1380d Merge pull request #26579 from Microsoft/jjh/ociprocess
Windows: OCI `process` struct and console size to uint
Upstream-commit: 889980d6e3
Component: cli
2016-09-19 22:52:16 +02:00
4c58473966 Create a system subcommand for events and info.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 1136c3458b
Component: cli
2016-09-19 16:29:17 -04:00
311b0765b1 Add formatter for service inspect
Allows the user to use `pretty` as the format string.
This enables users to put custom format options into their CLI config
just like is supported for `docker ps` and `docker images`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 20c5a9448d
Component: cli
2016-09-19 16:28:19 -04:00
54e30a1ee6 Make all the experimental subcommand consistent.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3e1b9350f5
Component: cli
2016-09-19 16:27:23 -04:00
1652332026 Windows: OCI process struct convergence
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f14f7711e7
Component: cli
2016-09-19 10:34:31 -07:00
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
Component: cli
2016-09-19 13:28:15 -04:00
93bceb1528 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: 68b7f55a45
Component: cli
2016-09-19 13:28:15 -04:00
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
Component: cli
2016-09-19 13:28:02 -04:00
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
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
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
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
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
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
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
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
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
91cf73d819 Refactor formatter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: db0952ad22
Component: cli
2016-09-13 17:58:12 -04:00
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
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
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
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
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
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
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