17aaa0890a
Merge pull request #27879 from sdurrheimer/zsh-completion-ps-health-filter
...
Add zsh completion for 'docker ps --filter health='
2016-10-29 19:23:55 +02:00
e1369f2f39
Merge pull request #27881 from albers/completion-ps--filter-health
...
Add bash completion for `docker ps --filter health`
2016-10-29 10:05:24 -07:00
72ec0f3488
Merge pull request #27878 from hqhq/fix_typos
...
Fix bunch of typos
2016-10-29 07:50:45 -04:00
5e6a59b59f
Add bash completion for `docker ps --filter health`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-29 04:26:08 -07:00
8df3d6a2a7
Add zsh completion for 'docker ps --filter health='
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-29 12:13:29 +02:00
e6866492c4
Fix bunch of typos
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-10-29 15:03:26 +08:00
515e5dade7
Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format
...
Fixes #24022 - Adds container health support to docker ps filter/format
2016-10-29 06:56:06 +02:00
507b4e9e4a
Merge pull request #27874 from duglin/addComment
...
Add a comment about how we don't mkdir during WORKDIR directly
2016-10-28 21:03:47 -07:00
9f79043a63
Add a comment about how we don't mkdir during WORKDIR directly
...
Just to help the next time someone goes looking for it while debugging.
Like @jhowardmsft and I did while looking at #27545 .
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-10-28 19:24:37 -07:00
1fb9c4e891
Merge pull request #27840 from estesp/add-userns-status-to-info
...
Add "userns" to `docker info` security options output
2016-10-29 02:58:34 +02:00
cff976a0b8
Merge pull request #27844 from LK4D4/fix_build_rpm
...
project: fix build rpm
2016-10-28 16:50:58 -07:00
a0eae7e3c0
Merge pull request #27867 from Microsoft/jjh/difftest
...
Windows: Port a docker diff test
2016-10-28 16:44:03 -07:00
a9753c333f
Merge pull request #26857 from thaJeztah/docs-add-missing-IPAM-options
...
docs: add missing IPAM options to API docs
2016-10-28 16:25:23 -07:00
d69fce79f9
docs: add missing IPAM options to API docs
...
Commit dd28ded711
2016-10-28 16:18:49 -07:00
ae74092e45
Add "userns" to `docker info` security options output
...
If user namespaces is enabled on the daemon, reveal that via docker info
by adding "userns" to the list of security options reported by the
info endpoint.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2016-10-28 19:16:57 -04:00
406c19f096
Merge pull request #27804 from anusha-ragunathan/blacklist-authz
...
Blacklist authz plugins that failed.
2016-10-28 15:06:20 -07:00
9ddbaddedc
Merge pull request #27851 from yuexiao-wang/add-format
...
Add --format to man and fix some typos
2016-10-28 23:58:20 +02:00
bf0fe87fe6
project: fix build rpm
...
* change workdir for accessing install-binaries.sh
* use other gopath for binaries to preserve sources
* add sources of proxy and grimes to rpc spec
* use dynamic proxy with -linkmode external in deb and rpm
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-10-28 14:34:17 -07:00
0fb23fb6bc
Merge pull request #27871 from yongtang/10282016-docs-max-concurrent-downloads-uploads
...
Update docs for dockerd.md about `max-concurrent-downloads/max-concurrent-uploads`
2016-10-28 14:32:48 -07:00
f190c7053e
Merge pull request #27870 from vdemeester/update-events-manpage-with-filters
...
Complete docker-events man page with filter list…
2016-10-28 14:22:02 -07:00
1f660febbd
Update docs for dockerd.md about `max-concurrent-downloads/max-concurrent-uploads`
...
It seems that `max-concurrent-downloads` and `max-concurrent-uploads`
are supported in Windows for `config.json`. Though that was not
mentioned in the docs for dockerd.md.
This fix adds the following to the example `config.json` file for Windows:
```
"max-concurrent-downloads": 3,
"max-concurrent-uploads": 5,
```
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-28 14:11:18 -07:00
beccf0f898
Merge pull request #27863 from Microsoft/jjh/clarifyworkdir
...
Windows: Clarify WORKDIR in docs
2016-10-28 14:07:03 -07:00
91f477b830
Merge pull request #27800 from lilybguo/group-add-rm
...
Service create --group param
2016-10-28 14:01:53 -07:00
c5adc271b2
Merge pull request #24725 from yongtang/24693-dockerfile-empty-line-after-escape
...
Fix dockerfile parser with empty line after escape
2016-10-28 13:53:15 -07:00
2f58494ae6
Service create --group param
...
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646
Signed-off-by: Lily Guo <lily.guo@docker.com>
Update flag documentation
Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups
Signed-off-by: Lily Guo <lily.guo@docker.com>
Fix docs for groups and update completion scripts
Signed-off-by: Lily Guo <lily.guo@docker.com>
2016-10-28 13:26:31 -07:00
c73dd3fe7b
Merge pull request #27758 from anusha-ragunathan/fix-overflow
...
Fix stack overflow in ErrInAdequateCapacity.
2016-10-28 13:10:54 -07:00
7d1fa71675
Complete docker-events man page with filter list…
...
… and examples.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-10-28 13:07:00 -07:00
010ee5a8e8
Merge pull request #27819 from lixiaobing10051267/masterDirInvalid
...
fill all the rest invalid address because no related directory
2016-10-28 13:05:18 -07:00
cfe7cb0292
Merge pull request #27815 from lixiaobing10051267/masterDocsDel
...
fill the complete address because of no userguide directory
2016-10-28 13:04:04 -07:00
f860289131
Merge pull request #27369 from cezarsa/hc
...
Add --health-* flags to service create and update
2016-10-28 21:59:52 +02:00
1a149a0ea5
Adds container health support to docker ps filter
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
2016-10-28 15:43:04 -04:00
9aa7501696
Merge pull request #27842 from Microsoft/jjh/supportdiff
...
Windows: support docker diff
2016-10-28 12:41:08 -07:00
5cab19a08b
Windows: Port a docker diff test
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-28 12:21:54 -07:00
f81c538fec
Merge pull request #27700 from Microsoft/jjh/servicerestart
...
Windows: Set service recovery options
2016-10-28 12:06:24 -07:00
f391f9c3b9
Merge pull request #27860 from vdemeester/update-go-connections-vendor
...
Update go-connections vendoring
2016-10-28 12:01:59 -07:00
7c809039f5
Merge pull request #27865 from Microsoft/jjh/builderdocsnanoserver
...
Update examples in builder.md
2016-10-28 11:44:38 -07:00
744cf2c971
Update examples in builder.md
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-28 11:36:11 -07:00
8a99bf6fa9
Merge pull request #27394 from Microsoft/jjh/runelevated
...
Windows: Hint to run client elevated
2016-10-28 11:25:04 -07:00
fae904af02
Update authz plugin list on failure.
...
When daemon fails to load an authz plugin, it should be removed from
the plugin list. Else the plugin is retried on every request and
response, resulting in undesired behavior (eg. daemon panic)
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-28 11:16:06 -07:00
b57f321a4a
Merge pull request #26709 from boucher/checkpoint-dir
...
Allow providing a custom storage directory for docker checkpoints
2016-10-28 11:12:44 -07:00
9e436c9aad
Merge pull request #26464 from vdemeester/11065-stop-signal-and-restart-policies
...
Taking stop-signal into account when docker kill
2016-10-28 11:08:55 -07:00
4fac603682
Windows: support docker diff
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-28 11:06:54 -07:00
1e989abefb
Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge
...
Fix issue for `--fixed-cidr` when bridge has multiple addresses
2016-10-28 11:05:01 -07:00
9842f019ec
Merge pull request #27731 from albers/completion-export--output
...
Add bash completion for `docker export --output`
2016-10-28 10:59:05 -07:00
a52b9b4591
Merge pull request #27732 from albers/completion-pause-multiple-containers
...
Add support for multiple containers to bash completion for `docker pause`
2016-10-28 10:58:34 -07:00
e87c6dd3e4
Windows: Clarify WORKDIR in docs
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-28 10:28:38 -07:00
87ddc8b0a5
Merge pull request #26837 from AkihiroSuda/newtmpfs
...
api: add TypeTmpfs to api/types/mount
2016-10-28 19:21:26 +02:00
7bd2611789
Add --health-* commands to service create and update
...
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
2016-10-28 15:19:08 -02:00
4db753c017
Fix stack overflow in ErrInAdequateCapacity.
...
fmt package formats an error by calling its Error() method.
This results in recursion. Fix this. Also remove dead code.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-28 10:02:48 -07:00
1462ea37d0
Merge pull request #27856 from albers/completion-service-create--env-file
...
Add bash completion for `docker service create --env-file`
2016-10-28 19:00:06 +02:00
Vincent Demeester
Sebastiaan van Stijn
Doug Davis
Harald Albers
Steve Durrheimer
Qiang Huang
Doug Davis
Sebastiaan van Stijn
Phil Estes
Anusha Ragunathan
Alexander Morozov
Yong Tang
Michael Crosby
Lily Guo
Victor Vieux
Misty Stanley-Jones
Josh Horwitz
John Howard
John Howard
Brian Goff
Anusha Ragunathan
Cezar Sa Espinola