Alessandro Boch
734f4ec86d
Merge pull request #1514 from puneetpruthi/overlay_support
...
Overlay driver support for Solaris
2016-11-03 21:57:05 -07:00
Madhu Venugopal
fbfdf8a0fa
Merge pull request #1530 from msabansal/overlay-sd1
...
Overlay networking support for windows
2016-11-03 19:59:53 -07:00
Madhu Venugopal
3e11ddc4d9
Change vxlan-id start-idx to 4096
...
To make it consistent with windows and linux workers
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Fixed build breaks
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-11-03 16:50:15 -07:00
Madhu Venugopal
d1b012d97a
Windows overlay driver support
...
1. Base work was done by msabansal and nwoodmsft
from : https://github.com/msabansal/docker/tree/overlay
2. reorganized under drivers/windows/overlay and rebased to
libnetwork master
3. Porting overlay common fixes to windows driver
* 46f525cba8714e6368406
2016-11-03 16:50:04 -07:00
Madhu Venugopal
93914ef0f6
Vendoring hcsshim to pick overlay changes
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-03 16:13:42 -07:00
Alessandro Boch
c5ca82daf4
Merge pull request #1519 from sanimej/newlb
...
Add sandbox API for task insertion to service LB and service discovery
2016-11-03 13:31:46 -07:00
Jana Radhakrishnan
e052f27538
Merge pull request #1521 from sanimej/gstatus
...
Add NetworkDB API to fetch the per network peer (gossip cluster) list
2016-11-02 20:51:36 -07:00
Santhosh Manohar
2639231799
Merge pull request #1532 from msabansal/ResolverError
...
Fixing incorrect resovler error message shown on daemon startup
2016-11-02 16:56:45 -07:00
Santhosh Manohar
a00cb33ae0
Merge pull request #1525 from aboch/icc
...
Respect icc option for internal networks
2016-11-02 16:50:58 -07:00
Santhosh Manohar
c52c8ca6eb
Add NetworkDB API to fetch the per network peer (gossip cluster) list
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-11-02 13:58:15 -07:00
Jana Radhakrishnan
ea579a4d0e
Merge pull request #1477 from allencloud/fix-nits-in-comments
...
fix nits in comments and log
2016-11-02 09:58:18 -07:00
Jana Radhakrishnan
f32c9768a8
Merge pull request #1510 from allencloud/validate-network-and-endpoint-name-strictly
...
validate network and endpoint name more strictly
2016-11-02 09:57:50 -07:00
Jana Radhakrishnan
80ad2406c9
Merge pull request #1523 from yuexiao-wang/fix-typos
...
Fix some typos about error
2016-11-02 09:53:54 -07:00
Jana Radhakrishnan
6ffe3a2b3d
Merge pull request #1533 from aboch/ag
...
Allow concurrent calls to agentClose
2016-11-02 09:53:28 -07:00
Jana Radhakrishnan
c38c1bf9f7
Merge pull request #1524 from yuexiao-wang/serial-number
...
Modify the serial number for design document
2016-11-02 09:52:01 -07:00
Jana Radhakrishnan
b1e753137f
Merge pull request #1501 from sanimej/vip
...
Enable ping for service vip address
2016-11-02 09:45:14 -07:00
msabansal
3be080496d
Fixing incorrect resovler error message shown on daemon startup
...
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-11-01 14:51:41 -07:00
Alessandro Boch
efc25da851
Allow concurrent calls to agentClose
...
- This fixes a panic in memberlist.Leave() because called
after memberlist.shutdown = false
It happens because of two interlocking calls to NetworkDB.clusterLeave()
It is easily reproducible with two back-to-back calls
to docker swarm init && docker swarm leave --force
While the first clusterLeave() is waiting for sendNodeEvent(NodeEventTypeLeave)
to timeout (5 sec) a second clusterLeave() is called. The second clusterLeave()
will end up invoking memberlist.Leave() after the previous call already did
the same, therefore after memberlist.shutdown was set false.
- The fix is to have agentClose() acquire the agent instance and reset the
agent pointer right away under lock. Then execute the closing/leave functions
on the agent instance.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-01 14:51:08 -07:00
Santhosh Manohar
b249e8afe0
Merge pull request #1496 from aboch/st
...
Block non exposed port traffic on ingress nw interfaces
2016-10-31 12:16:29 -07:00
yuexiao-wang
807f14746d
Modify the serial number from 1 to 9
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-31 18:28:37 +08:00
allencloud
a1ed5b7be2
fix nits in comments and log
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-29 19:35:18 +08:00
Alessandro Boch
4218a0a650
Respect icc option for internal networks
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-28 11:42:50 -07:00
yuexiao-wang
97915bde44
Fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-29 01:31:35 +08:00
Alessandro Boch
a21d577b8b
Block non exposed port traffic on ingress nw interfaces
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-27 20:28:08 -07:00
Santhosh Manohar
ddc74ffced
Enable ping for service vip address
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-10-27 12:36:41 -07:00
Jana Radhakrishnan
fd70adfac5
Merge pull request #1494 from aboch/sipt
...
Do not update hosts file with internal networks endpoint IP
2016-10-26 13:00:22 -07:00
Alessandro Boch
b834dfcfa0
Merge pull request #1452 from yongtang/26341-fixed-cidr-multiple-addresses-bridge
...
Fix issue for `--fixed-cidr` when bridge has multiple addresses
2016-10-26 12:52:19 -07:00
Alessandro Boch
15c13e5169
Merge pull request #1333 from coolljt0725/cleanup_driver_endpoint
...
Remove driver endpoints on network deleting
2016-10-26 12:51:41 -07:00
Alessandro Boch
3d5c9e53e7
Merge pull request #1480 from pooya/master
...
Handle containers with different network drivers
2016-10-26 12:51:28 -07:00
Santhosh Manohar
a7e1718800
Add sandbox API for task insertion to service LB and service discovery
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-10-25 05:41:44 -07:00
Madhu Venugopal
1a8fe1208a
Merge pull request #1511 from anusha-ragunathan/fix-drvLoad
...
Update loadDriver to use pluginv2.
2016-10-24 10:43:55 -07:00
Yong Tang
53bf987984
Fix issue for --fixed-cidr when bridge has multiple addresses
...
This fix tries to address the issue raised in:
https://github.com/docker/docker/issues/26341
where multiple addresses in a bridge may cause `--fixed-cidr` to
not have the correct addresses.
The issue is that `netutils.ElectInterfaceAddresses(bridgeName)`
only returns the first IPv4 address.
This fix changes `ElectInterfaceAddresses()` and `addresses()`
so that all IPv4 addresses are returned. This will allow the
possibility of selectively choose the address needed.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-21 13:58:16 -07:00
Jana Radhakrishnan
0b2dd7ce5a
Merge pull request #1194 from aboch/ipd
...
Separate pool parsing from pool auto-allocation
2016-10-21 11:51:38 -07:00
Alessandro Boch
18c1727d1e
Merge pull request #1486 from sanimej/reap
...
Reap failed nodes after 24 hours
2016-10-20 21:49:17 -07:00
Alessandro Boch
b859ce411b
Do not update hosts file with internal networks endpoint IP
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-10-20 16:10:01 -07:00
Santhosh Manohar
e98b152bac
Reap failed nodes after 24 hours
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-10-20 11:24:04 -07:00
Alessandro Boch
6b74a8d479
Merge pull request #1476 from sanimej/time
...
Use monotonic clock source to reap networkDB entries
2016-10-20 07:30:41 -07:00
Santhosh Manohar
0a2537eea3
Use monotonic clock for reaping networkDB entries
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-10-19 22:30:47 -07:00
Alessandro Boch
43582e8ef1
Merge pull request #1516 from tya/fix-vagrant-box
...
Updated vagrant box, ubuntu/vivid64 was remove from atlas.hashicorp.com
2016-10-19 14:49:39 -07:00
Jana Radhakrishnan
3f28b09ad4
Merge pull request #1513 from justincormack/no-logrus-proxy
...
Do not use logrus for proxy
2016-10-19 14:33:29 -07:00
Ty Alexander
6293a1b8ca
Updated vagrant box, ubuntu/vivid64 was remove from atlas.hasicorp.com
...
Signed-off-by: Ty Alexander <ty.alexander@sendgrid.com>
2016-10-19 15:28:46 -06:00
Puneet Pruthi
ef50edefde
overlay driver support for Solaris
...
Signed-off-by: Puneet Pruthi <puneetpruthi@gmail.com>
2016-10-18 18:58:51 -07:00
Justin Cormack
65356ed861
Do not use logrus for proxy
...
This simplifies how we build it in docker/docker as no vendoring needed,
and this does program not use any logrus features.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-10-19 00:01:11 +01:00
Santhosh Manohar
ed88549edb
Merge pull request #1512 from mrjana/bugs
...
Fix map access race in populatedEndpoints
2016-10-18 10:44:41 -07:00
Jana Radhakrishnan
eae800acf0
Fix map access race in populatedEndpoints
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-18 10:20:05 -07:00
allencloud
761722395d
validate network and endpoint name more strictly
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-18 11:01:18 +08:00
Anusha Ragunathan
3504ed88d9
Update loadDriver to use pluginv2.
...
NetworkDrivers were still using v1 to Get plugins. Fix that.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-17 15:18:43 -07:00
Madhu Venugopal
9dce786794
Merge pull request #1225 from puneetpruthi/solaris_integ
...
libnetwork support for docker on Solaris
2016-10-14 17:46:23 -07:00
Puneet Pruthi
a48b541da3
libnetwork support for Solaris
...
Signed-off-by: Puneet Pruthi <puneetpruthi@gmail.com>
2016-10-14 16:38:23 -07:00
Madhu Venugopal
1c5e3c25d4
Merge pull request #1502 from aboch/mc
...
Run API check to assert xfrm modules
2016-10-14 16:33:47 -07:00
