Commit graph

1126 commits

Author SHA1 Message Date
Madhu Venugopal
e88b95c13f Remove isNodeAlive check while force deleting endpoint
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 17:49:17 -08:00
Jana Radhakrishnan
4255ac8b4d Merge pull request #867 from mavenugo/changelog
Adding changelog for vendoring libnetwork into docker
2016-01-12 15:59:48 -08:00
Madhu Venugopal
5e78e49f76 Adding changelog for vendoring libnetwork into docker
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 15:58:03 -08:00
Jana Radhakrishnan
ad14618fc0 Merge pull request #860 from LK4D4/fix_ctrlr_race
Fix race in setting ctrlr for network
2016-01-12 11:09:02 -08:00
Madhu Venugopal
8f4d7a1cf1 Merge pull request #861 from sanimej/bugs
EP lock shouldn't be held when trying for network lock
2016-01-12 11:08:09 -08:00
Jana Radhakrishnan
928bc5944f Merge pull request #862 from mavenugo/epcleanup
Force endpoint delete
2016-01-12 11:05:31 -08:00
Madhu Venugopal
02d6721763 dnet client update for -force unpublish and Integration Tests
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 18:50:38 +00:00
Madhu Venugopal
ec622bf158 Forced endpoint delete
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 18:50:28 +00:00
aboch
3bb9851cfd Merge pull request #850 from chenchun/bridge-internal
Add internal network support for bridge networks
2016-01-11 12:15:01 -05:00
Chun Chen
7b64b1c293 Add internal network support for bridge networks
Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-01-11 20:49:41 +08:00
Madhu Venugopal
88040e2e05 Merge pull request #619 from thieman/tnt-fix-issue-603
Fix etchosts.Update to not target hosts with given hostname as prefix
2016-01-10 15:53:39 -08:00
Travis Thieman
c6dfe4b795 Fix etchosts.Update to not target hosts with given hostname as prefix
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2016-01-10 10:58:49 -05:00
Santhosh Manohar
3e154b3cef EP lock shouldn't be held when trying network lock
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-08 19:25:53 -08:00
Alexander Morozov
3569adad28 Fix race in setting ctrlr for network
Race is with network.getController() method.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-08 13:32:36 -08:00
Jana Radhakrishnan
06ff0a98a0 Merge pull request #859 from mavenugo/globalalias
Global alias support
2016-01-08 12:38:51 -08:00
Madhu Venugopal
2db863e5d7 Global alias support
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-08 12:27:15 -08:00
Madhu Venugopal
291ab6fb5a Merge pull request #857 from rmb938/ipam_options
Accept IpamOptions via NetworkOptionIpam
2016-01-08 08:26:43 -08:00
Ryan Belgrave
16ff947fb6 IpamOptions per network not per ipam subnet
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-07 21:28:54 -05:00
Jana Radhakrishnan
b4acd1026b Merge pull request #856 from mavenugo/localalias
Support for container local alias
2016-01-07 17:50:31 -08:00
Madhu Venugopal
be981267c0 alias support in dnet and integration-tests
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-07 14:50:29 -08:00
Madhu Venugopal
63e20c2f3d Alias support
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-07 14:50:23 -08:00
Madhu Venugopal
60bbe6e2d4 Merge pull request #853 from aboch/cv6
Check if present before programming IPv6 in bridge
2016-01-07 12:32:12 -08:00
Jana Radhakrishnan
111747500d Merge pull request #841 from sanimej/newns
Docker embedded DNS server for service name resolution
2016-01-07 12:27:00 -08:00
Alessandro Boch
e22b54dee1 Check if present before programming IPv6 in bridge
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-07 09:37:57 -08:00
Jana Radhakrishnan
405377a58f Merge pull request #854 from aboch/ovlay
Delete veth on ep leave in overlay driver
2016-01-07 09:08:49 -08:00
Alessandro Boch
fe2fa218d8 Delete veth on ep leave in overlay driver
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-07 08:25:12 -08:00
Santhosh Manohar
cf7ed0a717 Embedded DNS server
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-07 00:25:26 -08:00
Madhu Venugopal
3184188851 Merge pull request #848 from aboch/nlvnd
Disable DAD for sandbox IPv6 addresses
2016-01-06 20:18:44 -08:00
aboch
dfea2836a5 Merge pull request #855 from mrjana/bugs
Fix golang.org/x/tools breakage in go 1.4
2016-01-06 18:42:40 -08:00
Jana Radhakrishnan
1051418559 Fix golang.org/x/tools breakage in go 1.4
A commit today(1/6/2016) in golang.org/x/tools broke
libnetwork builds because it now requires certain
go 1.5 packages while libnetwork still uses go1.4.
Fixed it by manually installing golang.org/x/tools from
release-branch.go1.5 which should work for us
even though it is versioned 1.5. The 1.4 release
branch is too old and doesn't work with latest golint
package.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-01-06 18:29:52 -08:00
Jana Radhakrishnan
c5d59968b0 Merge pull request #851 from sanimej/godep
Godep fixup to import miekg/dns library
2016-01-06 13:36:43 -08:00
aboch
2400d9b992 Merge pull request #842 from chenchun/internal
Add network options to NetworkInfo to display internal network option
2016-01-05 18:36:29 -08:00
Chun Chen
69fe328789 Add network options to NetworkInfo to display internal network option
Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-01-06 10:03:15 +08:00
Alessandro Boch
31016faad5 Disable DAD for sandbox IPv6 addresses
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-05 16:51:10 -08:00
Madhu Venugopal
ca5c41bb25 Merge pull request #849 from mrjana/bugs
Fix default make target
2016-01-05 16:33:47 -08:00
Jana Radhakrishnan
a7230732fd Merge pull request #526 from chenchun/cleanup_filter_docker_chain
Clean up docker chain of filter table as well on driver init
2016-01-05 16:08:18 -08:00
Jana Radhakrishnan
5b82b93285 Fix default make target
The default make target should be `all` by convention but
since it is not the first target it wasn't getting triggered
as the default target. Fixed the makefile to make `all`
the first and default target.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-01-05 15:55:27 -08:00
Chun Chen
797c32bcac Clean up docker chain of filter table as well on driver init
Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-01-05 13:02:16 +08:00
Santhosh Manohar
54145fdd20 Godep fixup to import miekg/dns library
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-04 16:43:32 -08:00
Alessandro Boch
abaaa23a8c Vendoring netlink
- bfd70f556483c008636b920dda142fdaa0d59ef9

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-04 16:43:01 -08:00
Madhu Venugopal
e1bfa95f41 Merge pull request #845 from achanda/regex
Fix regex for IPv6
2015-12-30 09:49:05 -08:00
Madhu Venugopal
830e52935d Merge pull request #818 from aboch/ir
Change isolation rules for multiple bridge networks
2015-12-30 05:29:12 -08:00
Abhishek Chanda
0ce2a2dba0 Fix regex for IPv6
Only match strings which end with ::1

Fixes #830

Signed-off-by: Abhishek Chanda <abhishek.becs@gmail.com>
2015-12-30 00:22:44 +05:30
Alessandro Boch
95f1bcc249 Change isolation rules for multiple bridge networks
- From subnet to interface

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-12-23 15:45:27 -08:00
Jana Radhakrishnan
36293e4e58 Merge pull request #839 from rosenhouse/fixup-readme
Fix up example code
2015-12-23 15:31:36 -08:00
aboch
4e7cba41d0 Merge pull request #840 from mrjana/bugs
Fix up Godeps and update docker/docker packages
2015-12-23 15:28:12 -08:00
Jana Radhakrishnan
e026deb981 Fix up Godeps and update docker/docker packages
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-12-23 15:07:33 -08:00
David Bellotti
921be8b633 Fix up example code
- runs to completion without error
- demonstrates info available when using bridge network driver

Closes #837

Signed-off-by: Gabe Rosenhouse <grosenhouse@pivotal.io>
2015-12-23 11:47:14 -08:00
Madhu Venugopal
c8dcb0340d Merge pull request #817 from aboch/pip
Add support for Endpoint's preferred IPv6 address
2015-12-23 00:03:39 -08:00
Alessandro Boch
2ecc6aa49e Add support for Endpoint's preferred IPv6 address
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-12-22 15:48:23 -08:00