Commit Graph

4030 Commits

Author SHA1 Message Date
bf09a06c6f Add DiskUsage method to SystemApiclient
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: d7efdb095e
Component: cli
2016-09-29 07:42:53 -07:00
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
Component: cli
2016-09-29 07:42:53 -07:00
a476179204 Add subcommand prune to the container, volume, image and system commands
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: da8eef56ce
Component: cli
2016-09-29 07:42:53 -07:00
6713fa0784 Update Images() to allow retrieving specific image size data
Those data include:
 - size of data shared with other images
 - size of data unique to a given image
 - how many containers are using a given image

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 82dc15836b
Component: cli
2016-09-29 07:42:53 -07:00
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
cf39dde222 Support parallel rm
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 5c1362ce59
Component: cli
2016-09-28 12:07:18 +08:00
03427eb002 Support parallel kill
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: f612b93d33
Component: cli
2016-09-28 12:03:19 +08: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
d17ffe273d client: pedantic checking of tlsconfig
Under the convoluted code path for the transport configuration,
TLSConfig was being set even though the socket type is unix. This caused
other code detecting the TLSConfig to assume https, rather than using
the http scheme. This led to a situation where if `DOCKER_CERT_PATH` is
set, unix sockets start reverting to https. There is other odd behavior
from go-connections that is also reproduced here.

For the most part, we try to reproduce the side-effecting behavior from
go-connections to retain the current docker behavior. This whole mess
needs to ripped out and fixed, as this pile spaghetti is unnacceptable.

This code is way to convoluted for an http client. We'll need to fix
this but the Go API will break to do it.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: e7678f3a37
Component: cli
2016-09-27 16:27:48 -07: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
8cab1d4131 Merge pull request #26839 from tonistiigi/build-cache
Implement build cache based on history array
Upstream-commit: 18f54cb62b
Component: cli
2016-09-26 17:31:49 +00: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
c8795696d6 validate service parameter in client side to avoid api call
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a16fed83af
Component: cli
2016-09-26 17:18:02 +08: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
1f2c1ccaf3 Merge pull request #25853 from jhorwit2/jah/event-refactor
Refactor to new engine-api events api 
Upstream-commit: 0da5e77c67
Component: cli
2016-09-24 11:07:12 +02: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
700f218052 ensures that transport.Client is closed while using cli.NewClient with *http.Client = nil.
Signed-off-by: qudongfang <qudongfang@gmail.com>
Upstream-commit: 9403a5b63e
Component: cli
2016-09-24 14:32:50 +08: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
3af0faba4d 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: 9f20fabc69
Component: cli
2016-09-23 11:30:06 -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
b06624604b Deprecate "daemon" subcommand
The daemon is in a separate (dockerd) binary
since docker 1.12, so should no longer be
used.

This marks the command as deprecated, and
adds it to the deprecated features list.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4a2f7d8092
Component: cli
2016-09-23 00:26:27 +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
92c2c018ea Refactor to new events api
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: 9acc93282e
Component: cli
2016-09-22 14:42:06 -04: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
412bbe39eb Move /x/net/context to context in docker client README
Signed-off-by: Josh Chorlton <jchorlton@gmail.com>
Upstream-commit: 59e38197ff
Component: cli
2016-09-22 18:45:23 +08: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
b3a642ff73 Merge pull request #26436 from stevvooe/remove-transport-package
client: remove transport package 
Upstream-commit: 8004cf1c10
Component: cli
2016-09-20 16:43:56 +02: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
0d757a87e7 client: remove transport package
This package doesn't really seem to do anything of real interest.
Removing it and replacing with a few helper functions. Most of this was
maintaining a fork of ctxhttp to support a mock that was unnecessary.

We could probably do with a further refactor of the client interface.
There is a lot of confusion of between transport, http layer and
application layer that makes for some awkward code. This change
improves the situation to the point where no breaking changes are
introduced.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: c648e163eb
Component: cli
2016-09-19 11:19:55 -07:00
9f2c286fe0 Windows: OCI process struct convergence
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6be7efbe30
Component: cli
2016-09-19 10:34:31 -07: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