f739281994
Linux upstream kernel Overlay file systems support SELinux
...
Remove checks that prevent overlay and SELinux from working together.
Fixes are arriving in the 4.9 kernel.
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: b71cd179fa7651a48955d3879fae647d6d933bf0
Component: engine
2016-08-11 11:40:19 -04:00
63a92c313a
Merge pull request #25603 from mavenugo/1.12-rc1-ln-vin
...
Vendoring libnetwork for 1.12.1-rc1
Upstream-commit: e4a88b3a23230bdcafe5cb0f410a7d030a66bf17
Component: engine
2016-08-11 15:39:28 +02:00
adf210319c
Merge pull request #25556 from vieux/plugin_description
...
add description in docker plugin ls
Upstream-commit: ed1a313d8f03ce1cc2eef56e66644fccb4d61eaa
Component: engine
2016-08-11 14:08:50 +02:00
3344338b88
Merge pull request #25604 from allencloud/add-missing-fields-in-volume-api
...
add fields in volume api for 1.24, 1.25
Upstream-commit: a3432c2fdbc2bdab15e49599815f42660904fdd9
Component: engine
2016-08-11 14:03:25 +02:00
0eb3f4278c
add fields in volume api for 1.24, 1.25
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b015fd4fb3a8def4812491bae702275efc6ab0cb
Component: engine
2016-08-11 19:56:17 +08:00
78c72ac827
Merge pull request #25611 from lixiaobing10051267/masterJoin
...
docker swarm join command has no flag '--swarm-token'
Upstream-commit: f1101ebf3e8fed953528c30bb7d329857fb58805
Component: engine
2016-08-11 13:30:07 +02:00
ea7fd73f3c
docker swarm join command has no flag 'X--swarm-token'
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fcf732117df0d4a57202cc056ee9c24749745bd4
Component: engine
2016-08-11 19:49:38 +08:00
ed03b3e574
Merge pull request #25610 from lixiaobing10051267/masterSwarm
...
optimize some descriptions for swarm nodes.md
Upstream-commit: 81fca603a4c828a7bca882cd504cc32b0a7b0d1d
Component: engine
2016-08-11 13:29:47 +02:00
a0f2fd5022
optimize some descriptions for swarm nodes.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fa52bd5cf8f8e40189a0a9ba1bac61bd5ace4a91
Component: engine
2016-08-11 19:07:56 +08:00
ca39dfa474
Merge pull request #25573 from thaJeztah/improve-runmetrics-layout
...
docs: improve layout for runmetrics
Upstream-commit: a19029a719f209f1bf2e760f11225027787550e2
Component: engine
2016-08-11 10:43:15 +02:00
4074463266
Merge pull request #25585 from yongtang/22311-log-opts-map
...
Update docs so that log-opts takes map (`{}`) instead of `[]`
Upstream-commit: e42cc1f6c53a139e08c28dee607105eecafc029e
Component: engine
2016-08-11 09:55:25 +02:00
1383b4fbda
Merge pull request #25590 from thaJeztah/add-node-force-remove-api-docs
...
Add node remove "force" parameter to 1.25 API docs
Upstream-commit: e26c35408d178e8f6b7c57e26dc57c6fa611622c
Component: engine
2016-08-11 09:47:41 +02:00
a67684d015
Vendoring libnetwork for 1.12.1-rc1
...
* Fixes https://github.com/docker/docker/issues/25236
* Fixes https://github.com/docker/docker/issues/24789
* Fixes https://github.com/docker/docker/issues/25340
* Fixes https://github.com/docker/docker/issues/25130
* Fixes https://github.com/docker/libnetwork/issues/1387
* Fix external DNS responses > 512 bytes getting dropped
* Fix crash when remote plugin returns empty address string
* Make service LB work from self
* Fixed a few race-conditions
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6645ff8ac1e6ff1c1a67b5d7d33b34dbdebf2924
Component: engine
2016-08-11 00:12:43 -07:00
5b967c9349
deal with firewalld/docker startup issues
...
added the firewalld.service symbol in the After line docker
will always start after firewalld, thus eliminating the issue
of firewall blocking all mapped traffic.
Signed-off-by: Ramon Brooker <Ramon.Brooker@imaginecommunications.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 73e08286f920881a431fa7befd3909e72303680b
Component: engine
2016-08-11 00:13:33 +02:00
64cc925c02
Merge pull request #25546 from tonistiigi/update-swarmkit
...
vendor: update swarmkit to cb6d8131
Upstream-commit: 2a540c18b69bebd7153ba87ffc91aade95ba2769
Component: engine
2016-08-10 15:03:08 -07:00
361e7bc477
Merge pull request #25588 from thaJeztah/fix-events-since-description
...
Fix events "since" query parameter description
Upstream-commit: 960b7de456883864479428cdabb5189a348eb700
Component: engine
2016-08-10 23:32:26 +02:00
4fe64ab5f6
Fix events "since" / "until" query parameter description
...
The "since" query parameter can be *useful*
for polling (in combination with "until"), but
doesn't actualy stop the endpoint from streaming
events.
This patch updates the description to better
clarify that "since" does not make the endpoint
non-streaming.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ceed39b530838451b5b9c64b372307a0cc8492ab
Component: engine
2016-08-10 23:17:04 +02:00
fcebb07e97
Add node remove "force" parameter to 1.25 API docs
...
This parameter was documented for 1.24, but we
forgot to add it to the 1.25 docs as well.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06fa5c12e8a0a4a6ed5766ff123fff06343c603c
Component: engine
2016-08-10 23:01:17 +02:00
28fcc3f1f9
Update executor fixes from swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 5673c53417d689704ca7b5715f5c4d549fdf710c
Component: engine
2016-08-10 13:27:38 -07:00
0130526e07
vendor: update swarmkit to cb6d8131
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3b555a575dfe9badbcd31fd8bc1f03fde746fe88
Component: engine
2016-08-10 13:27:38 -07:00
f7227f216b
add description in docker plugin ls
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 16d5fbfd9aa28d6dab250452b30b51b7916b0888
Component: engine
2016-08-10 13:06:18 -07:00
e6d8343517
Update docs so that log-opts takes map ({}) instead of []
...
This fix updates docs so that log-opts takes map (`{}`) instead
of `[]`, as is defined in the impmenetation (`map[string]string`)
This fix fixes 22311.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f9ef1c892d2ed345ac8ab83977bc710a8c13d652
Component: engine
2016-08-10 12:50:10 -07:00
f2ff00f808
Ignore socket rm errors on daemon suite teardown
...
Errors here are not important and not really related to set success/failure.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e34244842ca968ff96769d1b5eab52fecddee80d
Component: engine
2016-08-10 15:18:35 -04:00
fad1c60365
Merge pull request #25567 from justincormack/name_to_handle_at
...
Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH
Upstream-commit: 19a3289250e5b22081439659d34f8bd4266ed0a3
Component: engine
2016-08-10 12:02:23 -07:00
db498d9dca
Merge pull request #25550 from mrjana/net
...
Retry creating dynamic networks if not found
Upstream-commit: 92b10b497cf272f8fd307e2e6cc1f27199f132cd
Component: engine
2016-08-10 11:52:56 -07:00
874b6f9cd1
Merge pull request #25334 from crosbymichael/selinux-fedora
...
Add selinux policy per distro/version
Upstream-commit: fc40ed24d810ea481dd358990926bc57d40c308d
Component: engine
2016-08-10 11:40:33 -07:00
cb1c855c27
Merge pull request #23951 from allencloud/defer-os-file-close
...
add defer file.Close to avoid potential fd leak
Upstream-commit: 64605d709f9bf5677d513d6ed78d63fffadc697d
Component: engine
2016-08-10 11:07:15 -07:00
b3651d506c
Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie
...
Add support to install Docker on raspbian/jessie
Upstream-commit: a6aea68c35a6d0c27d2c299aaeff6aecd9a451e8
Component: engine
2016-08-10 11:06:04 -07:00
ea87241cea
Merge pull request #25569 from friism/fix-typo-in-security-doc
...
update intro to say there are four things to consider
Upstream-commit: ce2ca236db87f8f580cb29be27b4f0b5341af0ca
Component: engine
2016-08-10 10:34:43 -07:00
8095bfc379
Merge pull request #25553 from vieux/restart_plugin
...
fix plugins restart on docker restart
Upstream-commit: 93b9b19204cc82a5b7205726f452020e209903d1
Component: engine
2016-08-10 10:34:17 -07:00
8ab414f46c
Improve layout for runmetrics
...
Change bullet-lists to tables
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 29fb644c189d710823540a06128a1e0ff6c01282
Component: engine
2016-08-10 18:42:43 +02:00
abb7fbbaec
update intro to say there are four things to consider
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 9c37bf9f1fc28ef28dc62ea496e6f56dafcdfd89
Component: engine
2016-08-10 08:45:24 -07:00
5cad711215
Merge pull request #25563 from lixiaobing10051267/master100
...
test container state timeout with 200 milliseconds
Upstream-commit: 414e3f3caba6068d9fcde068eb3240456bc0b3ad
Component: engine
2016-08-10 15:32:55 +02:00
3fbb0152cb
Merge pull request #25406 from pwzgorilla/master
...
use `proto` and `addr` replace `protoAddrParts[0]` and `protoAddrPart…
Upstream-commit: 3b1f82b52d53814e5ab60928de052ae2dba63f28
Component: engine
2016-08-10 14:07:30 +02:00
77bffbde97
Merge pull request #25427 from yongtang/25404-service-update-env-add
...
Fix `service update --env-add` issue
Upstream-commit: 59ca493121680212ab119cbf264fcdb75b699adf
Component: engine
2016-08-10 14:07:05 +02:00
d430eb5c8c
Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH
...
Only open_by_handle_at requires CAP_DAC_READ_SEARCH.
This allows systemd to run with only `--cap-add SYS_ADMIN`
rather than having to also add `--cap-add DAC_READ_SEARCH`
as well which it does not really need.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: c1ca124682a90f3306b34ad104ba80e413f7bf88
Component: engine
2016-08-10 12:22:36 +01:00
7c36224e9c
test container state timeout with 200 milliseconds
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 51f927d4e5007d11d71a9cd68a6b1e93828becc5
Component: engine
2016-08-10 17:19:25 +08:00
6e6c038441
use proto and addr replace protoAddrParts[0] and protoAddrParts[1]
...
Signed-off-by: mgniu <mgniu@dataman-inc.com >
Upstream-commit: dc4dcf89d885bc9bbd936337318236768dea478b
Component: engine
2016-08-10 16:03:00 +08:00
058048cb32
Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs
...
Add delete and update API documentation
Upstream-commit: 2f167a760904f5cf4f6250a55aa8f735fba74594
Component: engine
2016-08-10 08:01:13 +02:00
1c502571ef
add defer file.Close to avoid potential fd leak
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0ead624473b6bddc232b46bc7c76ab4f9c743ff5
Component: engine
2016-08-10 08:36:09 +08:00
1ea11295f3
Retry creating dynamic networks if not found
...
In cases there are failures in task start, swarmkit might be trying to
restart the task again in the same node which might keep failing. This
creates a race where when a failed task is getting removed it might
remove the associated network while another task for the same service
or a different service but connected to the same network is proceeding
with starting the container knowing that the network is still
present. Fix this by reacting to `ErrNoSuchNetwork` error during
container start by trying to recreate the managed networks. If they
have been removed it will be recreated. If they are already present
nothing bad will happen.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 117cef5e9766d6ba228770c225e816c6afd16ff8
Component: engine
2016-08-09 13:37:11 -07:00
b9457de055
Merge pull request #25518 from yuexiao-wang/add-debug-info
...
add more info for debugging
Upstream-commit: eb28dde01f165849bf372e18200e83042c76f26c
Component: engine
2016-08-09 11:56:09 -07:00
2921fa6d1b
fix plugin restart on docker restart
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: ab12ed4a5642edb4d96b54b6152f12260093f3ea
Component: engine
2016-08-09 11:49:28 -07:00
b9dc82dd29
Merge pull request #25415 from avaid96/exitret
...
added functionality to interrupt the terminal when it is waiting for …
Upstream-commit: 91853e44aeb20e55bcfcad5041c274783fdc06bc
Component: engine
2016-08-09 16:47:54 +02:00
bc307a89de
Merge pull request #25461 from coolljt0725/fix_update_mem
...
Fix update memory without memoryswap
Upstream-commit: 8233e2b54d8c88d9c5845cbd30d54e7d5d8cb852
Component: engine
2016-08-09 16:02:55 +02:00
fe7b1d72f0
Merge pull request #23391 from Microsoft/WindowsSandboxSize
...
Windows: Added support for storage-opt size
Upstream-commit: 04e021d7511fcfdc0838a0165f70a4772c0e7718
Component: engine
2016-08-09 15:34:39 +02:00
1934f7b605
Merge pull request #25530 from thaJeztah/docs-update-image-load-response
...
docs: add missing "quiet" parameter for image/load and update response
Upstream-commit: 06e3ea141707bc3a1d31a18c4768ed6bbf3976d4
Component: engine
2016-08-09 15:26:16 +02:00
7cd50dad87
Add delete and update API documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: da325c035df5f9d733c130bb57065cad2c9bf7fc
Component: engine
2016-08-09 14:50:46 +02:00
46019ac375
Update example output for node inspect
...
commit 41d580c7a610d8111dc63353cbd94319ca854627 added
"Joined at" to the output of node inspect,
but I forgot that docs changes are needed.
This change updates the example output
of node inspect in the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dcb052c12bf6e67184d0cb6a69daf39c25666cfe
Component: engine
2016-08-09 13:04:35 +02:00
aae342284e
Merge pull request #25512 from diogomonica/add-created-at
...
Adding Joined at to node inspect --pretty
Upstream-commit: 41d580c7a610d8111dc63353cbd94319ca854627
Component: engine
2016-08-09 12:56:32 +02:00
