beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1151 commits 14 branches 412 tags 338 MiB
Commit graph

1151 commits

This branch
This branch
All branches
Author SHA1 Message Date
Santhosh Manohar
4e25ffc8d9 Loopback IP shouldn't be filtered from resolv.conf in host mode 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-18 20:18:44 -08:00
Madhu Venugopal
840d82b8da Merge pull request #884 from sanimej/dns 
Enable embedded DNS server on network connect to a user defined network
 2016-01-20 15:58:59 -08:00
aboch
3e6a42bcdb Merge pull request #880 from mavenugo/ddd 
Force delete sandbox during sandboxCleanup
 2016-01-19 13:57:53 -05:00
Santhosh Manohar
5f22db217a Enable embedded DNS server on network connect to a user defined network 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-18 18:33:36 -08:00
Madhu Venugopal
315004b575 Cache scope in network object 
Its safe to cache the scope value in network object and can be reused
for cleanup operations. The current implementation assume the presence
of driver during cleanup operation. Since a remote driver may not be
present, we should not fail such cleanup operations. Hence make use of
the scope variable from network object.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-18 17:54:29 -08:00
Madhu Venugopal
10e4445fce Merge pull request #881 from vdemeester/docker-19404-fix-errorf 
Fixes docker/docker#19404
 2016-01-18 13:09:49 -08:00
Vincent Demeester
3d9c5a959c Fixes docker/docker#19404 
incorrect error message if custom IP if the custom IP-address is not
within a subnet of the network.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-18 10:50:59 +01:00
Madhu Venugopal
a7c52918fd Force delete sandbox during sandboxCleanup 
Stale sandbox and endpoints are cleaned up during controller init.
Since we reuse the exact same code-path, for sandbox and endpoint
delete, they try to load the plugin and it causes daemon startup
timeouts since the external plugin containers cant be loaded at that
time. Since the cleanup is actually performed for the libnetwork core
states, we can force delete sandbox and endpoint even if the driver is
not loaded.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-17 14:47:49 -08:00
Madhu Venugopal
69acfe6332 Merge pull request #863 from wenchma/typo_error 
Fixes some typo errors
 2016-01-16 12:23:52 -08:00
Madhu Venugopal
ef508a21ed Merge pull request #877 from sanimej/restart 
Setup embedded DNS server correctly on container restart
 2016-01-14 21:00:06 -08:00
aboch
aea47afd59 Merge pull request #874 from mavenugo/55 
changelog for v0.5.5
 2016-01-14 13:21:27 -05:00
Madhu Venugopal
94f4fb0b10 changelog for v0.5.5 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 10:19:18 -08:00
Santhosh Manohar
b48c479b17 changelog for v0.5.6 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-14 10:17:34 -08:00
Jana Radhakrishnan
e2ea1801f9 Merge pull request #873 from aboch/dpt 
Honor --iptables=false in bridge
 2016-01-14 10:16:38 -08:00
Santhosh Manohar
05bd52dbb6 Setup embedded DNS server correctly on container restart 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-14 10:16:13 -08:00
Madhu Venugopal
8bef5fd8d5 Merge pull request #866 from aboch/bsf 
IPAM to migrate from old bitmask to new one
 2016-01-14 10:06:11 -08:00
Alessandro Boch
21219731d3 IPAM to run consistency check over its bitmasks 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-14 08:26:14 -08:00
Alessandro Boch
854fe82ba1 Allow bitseq caller to run consistency check 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-14 08:25:40 -08:00
Alessandro Boch
b8d2ac9b65 Honor --iptables=false in bridge 
- When flag is false, not only do not program the chains,
  also do not perform any cleanup

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-13 23:45:05 -08:00
Jana Radhakrishnan
39e3fd2c29 Merge pull request #872 from mavenugo/ann_alias 
Allow network-scoped alias to be resolved for anonymous endpoint
 2016-01-13 14:03:05 -08:00
Madhu Venugopal
f9e4b40e5e Allow network-scoped alias to be resolved for annonymous endpoint 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-13 12:03:12 -08:00
wenchma
0b07ad6202 Fixes some typo errors 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-13 12:59:24 +08:00
Jana Radhakrishnan
86bb4aa112 Merge pull request #869 from mavenugo/fmeansf 
changelog for v0.5.4
 2016-01-12 18:35:54 -08:00
Madhu Venugopal
4161ddd747 changelog for v0.5.4 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-12 18:31:10 -08:00
Jana Radhakrishnan
be38401dd9 Merge pull request #868 from mavenugo/fmeansf 
Remove `isNodeAlive` check while force deleting endpoint
 2016-01-12 18:27:38 -08:00
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