d19255532a
Generate VolumesCreateRequest from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5c2498fd3c41f4badb1788665886d30772537f73
Component: engine
2016-10-31 11:13:41 -04:00
fa3a1f0666
Generate ErrorResponse struct from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bc757385455dee272ca563031afece05c935320b
Component: engine
2016-10-31 11:13:41 -04:00
914619c6f3
Cleanup volume swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 84a39c0830a3c9fa91d65db201ed9a925af7bfe6
Component: engine
2016-10-31 11:13:41 -04:00
31c5c30bb3
Generate VolumeList response from the swagger spec
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d459e83b1c993d63d5f94b85a7f8ddf3ac01beae
Component: engine
2016-10-31 11:13:41 -04:00
d375460d63
Merge pull request #27879 from sdurrheimer/zsh-completion-ps-health-filter
...
Add zsh completion for 'docker ps --filter health='
Upstream-commit: 17aaa0890a7f53cbd9c8806a93de73898ea92813
Component: engine
2016-10-29 19:23:55 +02:00
596b96c39e
Merge pull request #27881 from albers/completion-ps--filter-health
...
Add bash completion for `docker ps --filter health`
Upstream-commit: e1369f2f394bde84f9d0a3b262a9ce94971e039b
Component: engine
2016-10-29 10:05:24 -07:00
4011d7083d
Add bash completion for docker ps --filter health
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5e6a59b59f567d5e69d9ae9df98a89a69b2664bd
Component: engine
2016-10-29 04:26:08 -07:00
1fda59702c
Add zsh completion for 'docker ps --filter health='
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8df3d6a2a7e02ff1c7baf0a273d20b2422e38f39
Component: engine
2016-10-29 12:13:29 +02:00
34bac6f06e
Fix bunch of typos
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
2016-10-29 15:03:26 +08:00
0be42defbd
Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format
...
Fixes #24022 - Adds container health support to docker ps filter/format
Upstream-commit: 515e5dade7a006dbd2c42880f1af695da22ece60
Component: engine
2016-10-29 06:56:06 +02:00
d85153c870
Merge pull request #27874 from duglin/addComment
...
Add a comment about how we don't mkdir during WORKDIR directly
Upstream-commit: 507b4e9e4aed26170802b2691e47c59b2c6cf403
Component: engine
2016-10-28 21:03:47 -07:00
0d12f299cb
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 >
Upstream-commit: 9f79043a63302258a597a69b0c5ec5e09a480ac0
Component: engine
2016-10-28 19:24:37 -07:00
4e9b278e51
Merge pull request #27840 from estesp/add-userns-status-to-info
...
Add "userns" to `docker info` security options output
Upstream-commit: 1fb9c4e89188f48c79889f6128fdec865bed467d
Component: engine
2016-10-29 02:58:34 +02:00
ed6994ddbe
Merge pull request #27844 from LK4D4/fix_build_rpm
...
project: fix build rpm
Upstream-commit: cff976a0b8a52ff2baee3f3cc503276862278153
Component: engine
2016-10-28 16:50:58 -07:00
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
68b003581b
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 >
Upstream-commit: ae74092e450f1f2665b90257b65513cc0c19702f
Component: engine
2016-10-28 19:16:57 -04: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
30520bd0c0
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 >
Upstream-commit: bf0fe87fe6acb0ad55539fdfa565dcdca8e343a5
Component: engine
2016-10-28 14:34:17 -07: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
5b866e7f54
Adds container health support to docker ps filter
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: 1a149a0ea59b6653e0ba14599476bfe19c4c33f3
Component: engine
2016-10-28 15:43:04 -04: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
