092d6f43e2
Merge pull request #27867 from Microsoft/jjh/difftest
...
Windows: Port a docker diff test
Upstream-commit: a0eae7e3c0e037f73445a4f77a4dfcd1042be75c
Component: engine
2016-10-28 16:44:03 -07:00
3b7e266f9c
docs: add missing IPAM options to API docs
...
Commit dd28ded711417c72d2e228d1ace129ac5fd05f19
brought in new networking features and API, but
did not document the available IPAM options.
This adds a description of those options.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d69fce79f94b807ccb0f2f64c47881ee8fc31250
Component: engine
2016-10-28 16:18:49 -07:00
8d3cacc3b2
Merge pull request #27804 from anusha-ragunathan/blacklist-authz
...
Blacklist authz plugins that failed.
Upstream-commit: 406c19f0961c5987c8ce3f980b6fbf36e845f9c4
Component: engine
2016-10-28 15:06:20 -07:00
2f6eac7cd7
Merge pull request #27851 from yuexiao-wang/add-format
...
Add --format to man and fix some typos
Upstream-commit: 9ddbaddedc13ce8be238331176a22be55eb1808f
Component: engine
2016-10-28 23:58:20 +02:00
6c60350948
Merge pull request #27871 from yongtang/10282016-docs-max-concurrent-downloads-uploads
...
Update docs for dockerd.md about `max-concurrent-downloads/max-concurrent-uploads`
Upstream-commit: 0fb23fb6bc59f406a7e532385f27e31374260966
Component: engine
2016-10-28 14:32:48 -07:00
1d53ce0487
Merge pull request #27870 from vdemeester/update-events-manpage-with-filters
...
Complete docker-events man page with filter list…
Upstream-commit: f190c7053ec5343e2b5ffe7d6debf54173d28df2
Component: engine
2016-10-28 14:22:02 -07:00
ab40031c77
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 >
Upstream-commit: 1f660febbd114f40e5232ba3137ac4f912ab53cc
Component: engine
2016-10-28 14:11:18 -07:00
6aae774656
Merge pull request #27863 from Microsoft/jjh/clarifyworkdir
...
Windows: Clarify WORKDIR in docs
Upstream-commit: beccf0f8986d1182fc2b3e192508d1309d5fc5c1
Component: engine
2016-10-28 14:07:03 -07:00
7523d02582
Merge pull request #27800 from lilybguo/group-add-rm
...
Service create --group param
Upstream-commit: 91f477b8309fd09f27d613c1c3bfc7afb2fd137c
Component: engine
2016-10-28 14:01:53 -07:00
d280390d0c
Merge pull request #24725 from yongtang/24693-dockerfile-empty-line-after-escape
...
Fix dockerfile parser with empty line after escape
Upstream-commit: c5adc271b2991c1eb8a25cdab14e425edb2cd99b
Component: engine
2016-10-28 13:53:15 -07:00
ed2e1f6e2b
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 >
Upstream-commit: 2f58494ae6e796325329f849cf547bcf94bb68e3
Component: engine
2016-10-28 13:26:31 -07:00
94a4717dfa
Merge pull request #27758 from anusha-ragunathan/fix-overflow
...
Fix stack overflow in ErrInAdequateCapacity.
Upstream-commit: c73dd3fe7b0ef6c8e4e16a72b22f32f33113fac1
Component: engine
2016-10-28 13:10:54 -07:00
ce1517234b
Complete docker-events man page with filter list…
...
… and examples.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7d1fa716758abc455c6cf037ee3862fb7c848486
Component: engine
2016-10-28 13:07:00 -07:00
41f493236b
Merge pull request #27819 from lixiaobing10051267/masterDirInvalid
...
fill all the rest invalid address because no related directory
Upstream-commit: 010ee5a8e84b3bb5f5a79690e77fd9b135643641
Component: engine
2016-10-28 13:05:18 -07:00
b0519ec516
Merge pull request #27815 from lixiaobing10051267/masterDocsDel
...
fill the complete address because of no userguide directory
Upstream-commit: cfe7cb0292eb9654fba13d380ead30f2525d09df
Component: engine
2016-10-28 13:04:04 -07:00
86df94b9ba
Merge pull request #27369 from cezarsa/hc
...
Add --health-* flags to service create and update
Upstream-commit: f860289131e36ad2dde5ebe60d15a86fd97934b5
Component: engine
2016-10-28 21:59:52 +02:00
c8cb7f1f85
Merge pull request #27842 from Microsoft/jjh/supportdiff
...
Windows: support docker diff
Upstream-commit: 9aa75016967ef36753f7e270bed03d9805b84ad8
Component: engine
2016-10-28 12:41:08 -07:00
66e7a8f02f
Windows: Port a docker diff test
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5cab19a08b9a29a22ee956de4520fceab2be5e3b
Component: engine
2016-10-28 12:21:54 -07:00
929d4f87ec
Merge pull request #27700 from Microsoft/jjh/servicerestart
...
Windows: Set service recovery options
Upstream-commit: f81c538fec66e1dc63fd74054b9a7245d5c00e3a
Component: engine
2016-10-28 12:06:24 -07:00
500367df6e
Merge pull request #27860 from vdemeester/update-go-connections-vendor
...
Update go-connections vendoring
Upstream-commit: f391f9c3b9e3db1149e6bc13ee2117cb69e6a617
Component: engine
2016-10-28 12:01:59 -07:00
a83a8ad571
Merge pull request #27865 from Microsoft/jjh/builderdocsnanoserver
...
Update examples in builder.md
Upstream-commit: 7c809039f5efe5ac22194f229dd4951cd6d831f6
Component: engine
2016-10-28 11:44:38 -07:00
7e8bfe389f
Update examples in builder.md
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 744cf2c9718a43aad21c6dee53a07856ef06fc79
Component: engine
2016-10-28 11:36:11 -07:00
9988859ce7
Merge pull request #27394 from Microsoft/jjh/runelevated
...
Windows: Hint to run client elevated
Upstream-commit: 8a99bf6fa9d7efe4dea275a610824d01ed969b9b
Component: engine
2016-10-28 11:25:04 -07:00
78119ce904
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 >
Upstream-commit: fae904af02a184833d2cd5ce9fdd61a4083707c7
Component: engine
2016-10-28 11:16:06 -07:00
3ea22f139e
Merge pull request #26709 from boucher/checkpoint-dir
...
Allow providing a custom storage directory for docker checkpoints
Upstream-commit: b57f321a4a6ee3e14079b2913d5f90df0be49689
Component: engine
2016-10-28 11:12:44 -07:00
3b745bdb00
Merge pull request #26464 from vdemeester/11065-stop-signal-and-restart-policies
...
Taking stop-signal into account when docker kill
Upstream-commit: 9e436c9aad389de27f008cbf404fd907b23baa25
Component: engine
2016-10-28 11:08:55 -07:00
22458c8162
Windows: support docker diff
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4fac603682747476a12dba0df79c10e919eddefb
Component: engine
2016-10-28 11:06:54 -07:00
28336d95ca
Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge
...
Fix issue for `--fixed-cidr` when bridge has multiple addresses
Upstream-commit: 1e989abefba1a424b95d3fc1474e489ace747598
Component: engine
2016-10-28 11:05:01 -07:00
62e380aa24
Merge pull request #27731 from albers/completion-export--output
...
Add bash completion for `docker export --output`
Upstream-commit: 9842f019ec458ee4a5f892a08e76c319bd2c6a24
Component: engine
2016-10-28 10:59:05 -07:00
a4d5c582a1
Merge pull request #27732 from albers/completion-pause-multiple-containers
...
Add support for multiple containers to bash completion for `docker pause`
Upstream-commit: a52b9b4591b6146436d55d6579790fe6e842a714
Component: engine
2016-10-28 10:58:34 -07:00
d16a71e0f2
Windows: Clarify WORKDIR in docs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e87c6dd3e48135637d12067dd158252b5c27349b
Component: engine
2016-10-28 10:28:38 -07:00
bf7ee1cb20
Merge pull request #26837 from AkihiroSuda/newtmpfs
...
api: add TypeTmpfs to api/types/mount
Upstream-commit: 87ddc8b0a51248da4f9ab60b92901425c888282f
Component: engine
2016-10-28 19:21:26 +02:00
c05d99582c
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 >
Upstream-commit: 7bd2611789e6898576f7229255c238f7c1129293
Component: engine
2016-10-28 15:19:08 -02:00
0befe9514a
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 >
Upstream-commit: 4db753c0174420152957224d38fb6e8b6ae6908e
Component: engine
2016-10-28 10:02:48 -07:00
98f1727b06
Merge pull request #27856 from albers/completion-service-create--env-file
...
Add bash completion for `docker service create --env-file`
Upstream-commit: 1462ea37d0014ef5f7f3e4bd9d174bcd0185e71d
Component: engine
2016-10-28 19:00:06 +02:00
1fa0d4beb8
Update go-connections vendoring
...
This makes possible to use IPv6 addresses in the `--publish` flag of
docker (`run`, …)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 609c183ae7092c60b61021e61f181ae67dea331a
Component: engine
2016-10-28 09:35:30 -07:00
df07501298
Merge pull request #27850 from sdurrheimer/zsh-completion-service-create-env-file
...
Add zsh completion for 'docker service create --env-file'
Upstream-commit: b5d37a4242e259a80f7a9420740352e6a9dfa182
Component: engine
2016-10-28 17:50:59 +02:00
92cd9574a7
Add --format to man and fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 2d99344d3c55672e1d2805610835bf8b74cf1cfa
Component: engine
2016-10-28 22:31:20 +08:00
0bd2417b94
Fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 4d2af4430080e9c7ed5badc465be0e8f04b4b1a4
Component: engine
2016-10-29 00:46:16 +08:00
0e3402d520
Allow providing a custom storage directory for docker checkpoints
...
Signed-off-by: boucher <rboucher@gmail.com >
Upstream-commit: bd7d51292c399edba5f339e6be55fac6c0811ff5
Component: engine
2016-10-28 07:56:05 -04:00
b1f2523820
Add bash completion for docker service create --env-file
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b2db0cdae7b353c7bd4608579758f6c4a272f9fe
Component: engine
2016-10-28 12:53:32 +02:00
ecffd5b73a
api: add TypeTmpfs to api/types/mount
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 18768fdc2e76ec6c600c8ab57d2d487ee7877794
Component: engine
2016-10-28 08:38:32 +00:00
c162aa9149
Add zsh completion for 'docker service create --env-file'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 60813045c128b43cdd31f938a452abab9e9ebbc1
Component: engine
2016-10-28 08:10:42 +02:00
0b8e22519c
Merge pull request #27845 from cpuguy83/experimental_checks_daemon
...
error out if checkpoint specified on non-experimental
Upstream-commit: 0aaef963a880476d6637ad798c30520193ee04e3
Component: engine
2016-10-27 20:42:09 -07:00
ef5cf518c7
Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps
...
Add -q option to `docker service ps`
Upstream-commit: 89011970e04614dd285ea4c3423ec7a86602488b
Component: engine
2016-10-28 05:21:03 +02:00
dad340cfb8
Merge pull request #25800 from vdemeester/25798-fix-event-actions
...
Fix 25798 : Allow "partial/prefix" filter for health_status, exec_create and exec_start events
Upstream-commit: 10d77b878c473d5e85318aa889a74f1a31559bea
Component: engine
2016-10-28 05:20:49 +02:00
e39e12ad3b
Merge pull request #27839 from vdemeester/lets-clise-this
...
Small log formatting fixes
Upstream-commit: 5945ba64b28a371d9f82232890c8b92e8355971d
Component: engine
2016-10-28 05:20:24 +02:00
17e336a83a
fill all the rest invalid address because no related directory
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 7d1eb5ea1bcf68391576f92a0660ac785a498fd4
Component: engine
2016-10-28 11:12:54 +08:00
810cfad17d
fill the complete address because of no userguide directory
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 97c00f9754271bbc03c6309793482e11920e4f3e
Component: engine
2016-10-28 10:57:37 +08:00
4432c92e1d
vendor: update swarmkit
...
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com >
Upstream-commit: fd657a10d093d5dc838a07098054d0b855718f3b
Component: engine
2016-10-28 00:37:39 -02:00
