Alexander Morozov
33a7a92490
Merge pull request #27338 from yuexiao-wang/instream-err
...
Fix the incorrect description for NewInStream
Upstream-commit: 5eef6637ef
2016-10-13 12:32:43 -07:00
Tõnis Tiigi
d115bbf349
Merge pull request #27276 from yuexiao-wang/func-name
...
Modify function name from SetDaemonLogLevel to SetLogLevel
Upstream-commit: 1f17f52314
2016-10-13 12:10:59 -07:00
yuexiao-wang
939ccb7483
Fix the incorrect description for NewInStream
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b6fbe832ac
2016-10-13 22:33:09 +08:00
Sebastiaan van Stijn
52bff40f0e
Merge pull request #27294 from mlaventure/hide-unused-volume-fields
...
Move types.Volumes optional fields under a new type
Upstream-commit: 2e2f16a621
2016-10-11 23:55:25 +02:00
Kenfe-Mickael Laventure
bf3fe75f3b
Move types.Volumes optional fields under a new type
...
This allows us to hide those fields when they are not filled.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 5018781cab
2016-10-11 11:49:26 -07:00
yuexiao-wang
cd04735ef7
Modify function name from SetDaemonLogLevel to SetLogLevel
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: f4267969c7
2016-10-11 19:35:12 +08:00
Sebastiaan van Stijn
ddca0b9760
Merge pull request #26894 from thaJeztah/improve-log-level-help
...
Improve --log-level help text
Upstream-commit: bc50354deb
2016-10-11 12:35:42 +02:00
Sebastiaan van Stijn
9fad962ff9
Improve --log-level help text
...
This information was added in
1efc940e6f547760e5e8f4648acb120ff19fdc58,
but removed again in
a271eaeba224652e3a12af0287afbae6f82a9333
to make the help-output fit in a 80-chars
terminal.
This adds the available options again
in the help output, and updates the CLI
reference documentation to match actual
output.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bed046666a
2016-10-10 23:10:17 +02: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
John Howard
9d0867981a
Windows: Support credential specs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e307da732a
2016-10-06 09:32:22 -07:00
Alexander Morozov
69602c283c
Merge pull request #25837 from reaperhulk/support-compressing-build-context
...
Add support for compressing build context during image build
Upstream-commit: 8691f7c542
2016-10-05 12:57:46 -07:00
Arnaud Porterie
55fc58e15f
Merge pull request #26108 from mlaventure/data-mngt
...
New Data Management commands
Upstream-commit: 71ffe11776
2016-10-01 03:17:18 +00:00
Paul Kehrer
ad88944cf1
Add support for compressing build context during image build
...
When sending a build context to a remote server it may be
(significantly) advantageous to compress the build context. This commit
adds support for gz compression when constructing a build context
using a command like "docker build --compress ."
Signed-off-by: Paul Kehrer <paul.l.kehrer@gmail.com >
Upstream-commit: e25646bbc0
2016-09-30 17:46:08 -05:00
Sebastiaan van Stijn
f93c39a901
Merge pull request #27049 from dnephin/fix-label-flag-type
...
Use ListOpt for build labels
Upstream-commit: ebfd0d6602
2016-09-30 23:40:08 +02:00
Kenfe-Mickael Laventure
326cca001f
Add new df subcomand to the system command
...
This command display the state of the data usage of the docker daemon.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 3f8c4be283
2016-09-30 14:35:23 -07:00
Vincent Demeester
8ba28247b6
Merge pull request #26697 from allencloud/change-service-scale-logic
...
validate service parameter in client side to avoid api call in `docker service scale`
Upstream-commit: e2870295aa
2016-09-30 18:37:35 +02:00
Daniel Nephin
8d6b5149c7
Use ListOpt for labels.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d6b5a807d7
2016-09-29 17:59:52 -04: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
Kenfe-Mickael Laventure
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
2016-09-29 07:42:53 -07:00
allencloud
d882807966
add \n in engine labels display in docker node inspect xxx --pretty
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 65b1e54c73
2016-09-29 18:17:54 +08:00
Vincent Demeester
4c5ae70968
Merge pull request #24850 from yongtang/24270-service-tasks-filter
...
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: 5ca7909308
2016-09-28 11:50:27 +02: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
Brian Goff
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
2016-09-27 20:30:26 -04:00
Vincent Demeester
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
2016-09-27 18:46:51 +02:00
Vincent Demeester
72959f648d
Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
...
add endpoint mode in service pretty
Upstream-commit: b322c8e506
2016-09-27 18:28:43 +02:00
Akihiro Suda
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
2016-09-27 15:27:02 +00:00
Yong Tang
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
2016-09-27 04:19:38 -07:00
allencloud
64b2b3acec
add endpoint mode in service pretty
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: cc375fafd0
2016-09-27 18:41:19 +08:00
Yong Tang
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
2016-09-26 16:01:20 -07:00
Sebastiaan van Stijn
671a87f1cb
Merge pull request #23886 from AkihiroSuda/stackcli
...
add `docker stack ls`
Upstream-commit: 53c51901d7
2016-09-26 21:19:04 +02:00
Arnaud Porterie
72e91d1a5e
Merge pull request #26839 from tonistiigi/build-cache
...
Implement build cache based on history array
Upstream-commit: dc14c5aa27
2016-09-26 17:31:49 +00:00
allencloud
c8795696d6
validate service parameter in client side to avoid api call
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: a16fed83af
2016-09-26 17:18:02 +08:00
Aaron Lehmann
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
2016-09-26 10:12:24 +01:00
Vincent Demeester
127f51b740
Merge pull request #25853 from jhorwit2/jah/event-refactor
...
Refactor to new engine-api events api
Upstream-commit: e58c0c6e1b
2016-09-24 11:07:12 +02:00
John Howard
3d802fdc17
Add isolation to info
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 266b7564a5
2016-09-23 12:13:29 -07:00
Tõnis Tiigi
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
2016-09-23 11:30:06 -07:00
Vincent Demeester
bd30751e22
Merge pull request #26516 from yongtang/26453-build-bad-syntax
...
Check bad syntax on dockerfile before building.
Upstream-commit: cecd4904f3
2016-09-23 12:24:20 +02:00
Vincent Demeester
b0a2a84ed2
Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
...
support docker node ps multiNodes
Upstream-commit: e7e32f0465
2016-09-23 09:50:24 +02:00
Akihiro Suda
7883253071
add docker stack ls
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b06f3f27a4
2016-09-22 19:31:39 +00: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
Misty Stanley-Jones
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
2016-09-21 13:05:33 -07: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
Vincent Demeester
341cd5c250
Merge pull request #26716 from dnephin/move-system-commands
...
Create system subcommand
Upstream-commit: b7722cd80a
2016-09-20 15:54:01 +02:00
Vincent Demeester
22e1ef020d
Merge pull request #25025 from cpuguy83/service_inspect_formatter
...
Add formatter for service inspect
Upstream-commit: 333a0f348f
2016-09-20 14:49:45 +02:00
Daniel Nephin
98e76e1747
Merge pull request #26717 from dnephin/fix_experimental_commands
...
Make all the experimental subcommand consistent
Upstream-commit: 4ff733cf1c
2016-09-19 19:29:48 -04: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
Alexander Morozov
Tõnis Tiigi
yuexiao-wang
Sebastiaan van Stijn
Kenfe-Mickael Laventure
Sebastiaan van Stijn
allencloud
John Howard
Arnaud Porterie
Paul Kehrer
Vincent Demeester
Daniel Nephin
Zhang Wei
Brian Goff
Akihiro Suda
Yong Tang
Aaron Lehmann
Josh Horwitz
Misty Stanley-Jones
Daniel Nephin