Nalin Dahyabhai
937702b74d
Format network address using %v instead of %p
...
If we encounter an error setting an interface's IPv4 or IPv6 address,
log the addresses we tried to use using the %v specifier rather than %q.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2016-03-16 17:23:13 -04:00
Alessandro Boch
b38b52c6b4
Merge pull request #1024 from mavenugo/loc
...
Fixing a possible endpoint_cnt state inconsistency issue
2016-03-16 09:57:06 -07:00
Madhu Venugopal
40de5ef5e5
Merge pull request #1025 from sanimej/fixes
...
Clear cached udp connections on resolver Stop()
2016-03-16 09:24:11 -07:00
Chun Chen
fad736b24d
Merge pull request #921 from tonistiigi/fix-hooks-path
...
Fix netns path setting from hook
2016-03-16 23:10:10 +08:00
Tonis Tiigi
880d0ada95
Fix netns path setting from hook
...
Previously hook expected data with a wrong type.
Full netns path is not included with the data
passed with the hook.
Fixes #829
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-16 07:57:27 -07:00
Madhu Venugopal
4dde205544
Fixing a possible endpoint_cnt state inconsistency issue
...
During ungraceful shutdown, it is possible that the endpoint_cnt can be
inconsistent with the actual endpoints in a network. This fix will
resolve that inconsistency
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-15 21:07:42 -07:00
Jana Radhakrishnan
82b88f274a
Merge pull request #990 from aboch/ecl
...
Avoid network/endpoint_count inconsistences
2016-03-15 15:24:37 -07:00
Madhu Venugopal
5e0beecbdb
Merge pull request #670 from aboch/it
...
Change in bridge/setup_ip_tables.go
2016-03-15 12:39:15 -07:00
Alessandro Boch
c92a4e9fd6
Avoid network/endpoint count inconsistences
...
- ... on ungraceful shutdown during network create
- Allow forceful deletion of network
- On network delete, first mark the network for deletion
- On controller creation, first forcely remove any network
that is marked for deletion.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-15 09:09:13 -07:00
Santhosh Manohar
9a91bbeb4f
Clear cached udp connections on resolver Stop()
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-03-14 17:21:41 -07:00
Madhu Venugopal
0946e1444f
Merge pull request #1019 from nerdalert/v4_null_check
...
Reject a null v4 IPAM slice in exp vlan drivers
2016-03-13 08:08:58 -07:00
Brent Salisbury
2b2d011899
Reject a null v4 IPAM slice in exp vlan drivers
...
Issue #1018
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-03-13 00:42:00 -05:00
Alessandro Boch
176c9804f3
Merge pull request #1017 from mavenugo/master
...
changelog for 0.7.0-dev.7
2016-03-11 14:22:55 -08:00
Madhu Venugopal
433b29baca
Merge pull request #1016 from nerdalert/modprobe
...
Removed experimental drivers modprobe check
2016-03-11 14:15:30 -08:00
Madhu Venugopal
62c6bb12db
changelog for 0.7.0-dev.7
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-11 14:04:09 -08:00
Brent Salisbury
dda75448c3
Removed experimental drivers modprobe check
...
- Kernel requirements are checked w/o modprobe now
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-03-11 17:00:36 -05:00
Madhu Venugopal
1fa49a3551
Merge pull request #1015 from nerdalert/kernel_bump
...
Bumped ipvlan kernel version to >= 4.2
2016-03-11 11:44:26 -08:00
Brent Salisbury
fcf79b55ff
Bumped ipvlan kernel version to >= 4.2
...
- ipvlan l2 mode is buggy in < 4.2
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-03-11 14:28:32 -05:00
Madhu Venugopal
3c3e8834fb
Merge pull request #1001 from LK4D4/dbus_conn
...
Close dbus connection if firewalld is not started
2016-03-11 11:23:32 -08:00
Santhosh Manohar
7e798de5ec
Merge pull request #1012 from mavenugo/ipv
...
changelog for 0.7.0-dev.6
2016-03-10 18:20:55 -08:00
Madhu Venugopal
e052aeaaa0
changelog for 0.7.0-dev.6
...
* Experimental support of macvlan and ipvlan drivers
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-10 18:18:09 -08:00
Santhosh Manohar
5cb343717a
Merge pull request #1007 from mavenugo/ipv
...
ipvlan slaves must inherit the mac-address from parent
2016-03-10 18:16:13 -08:00
Madhu Venugopal
60bd944921
ipvlan slaves must inherit the mac-address from parent
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-10 18:05:45 -08:00
Santhosh Manohar
f068f57e03
Merge pull request #1010 from mavenugo/osl
...
Use osl.InitOSContext appropriately
2016-03-10 16:40:53 -08:00
Madhu Venugopal
64edd40fcc
Use osl.InitOSContext appropriately
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-10 16:30:10 -08:00
Madhu Venugopal
218c1014c7
Merge pull request #1011 from nerdalert/kernel_checks
...
Added kernel version checks for macvlan/ipvlan
2016-03-10 16:20:59 -08:00
Brent Salisbury
af75e8a624
Added kernel version checks for macvlan/ipvlan
...
ipvlan >= 4.0.0 due to early instability
macvlan >= 3.9
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-03-10 17:09:48 -05:00
Santhosh Manohar
469ea4eb3f
Merge pull request #1004 from mavenugo/mv
...
Adding the missing ExternalConnectivity driver methods
2016-03-09 19:47:59 -08:00
Madhu Venugopal
fe10aae30b
Adding the missing ExternalConnectivity driver methods
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-09 19:35:44 -08:00
Alessandro Boch
7e8a656991
Merge pull request #964 from nerdalert/ipvlan_macvlan
...
Added macvlan and ipvlan drivers
2016-03-09 18:15:10 -08:00
Madhu Venugopal
ed9601e4c6
Make macvlan and ipvlan drivers as experimental
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-03-09 19:43:20 -05:00
Alexander Morozov
a971c561d1
Close dbus connection if firewalld is not started
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-09 09:31:22 -08:00
Santhosh Manohar
22a48cd84f
Merge pull request #998 from aboch/fx
...
Fix docker IT failures for 0.7.0-dev.4 vendoring
2016-03-08 17:50:27 -08:00
Alessandro Boch
5ada0fa920
changelog for v0.7.0-dev.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-08 17:37:20 -08:00
Alessandro Boch
a75f64df20
Merge pull request #994 from sanimej/fixes
...
If anonymous container has alias names use it for DNS PTR record
2016-03-08 16:48:44 -08:00
Alessandro Boch
8cf7270d06
Miscellaneous fixes
...
- Fix npe in sbJoin error path
- Fail again endpoint Join in case of failure
in programming the external connectivity
- In bridge, look for parent and child container configs
in the generic data
- iptables.Exists() might be called before any other call to
iptables.raw(). We need to call checkInit() then.
Introduced by 1638fbdf27
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-08 15:49:47 -08:00
Alessandro Boch
84c1d626c6
Merge pull request #1000 from sanimej/panic
...
Fix out of bound slice access in etchosts.go/Delete()
2016-03-08 15:05:13 -08:00
Madhu Venugopal
d60c3bed51
Merge pull request #997 from aboch/cl
...
changelog for v0.7.0-dev.4
2016-03-07 18:01:45 -08:00
Alessandro Boch
392750e74c
changelog for v0.7.0-dev.4
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-07 17:52:56 -08:00
Madhu Venugopal
a66df11336
Merge pull request #995 from aboch/vcu
...
Fix veth leak in overlay driver
2016-03-07 17:21:50 -08:00
Alessandro Boch
dbf16c8302
Fix veth leak in overlay driver
...
- Because of the lazy logic in Leave(), the overlay
veth end is not moved from the sandbox to the host
network namspace until the last endpoint leaves.
We cannot rely on this logic to clear the veth pairs,
because on last endpoint leave we have no reference to
the other N-1 veth names.
- The fix is to delete the container veth end on endpoint delete.
This anyways deletes both veth ends, regardless they are in different
namespaces.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-07 15:17:22 -08:00
Madhu Venugopal
86e2b0243f
Merge pull request #989 from msabansal/IPFix
...
Fixed IP information not displayed properly in docker network inspect on Windows
2016-03-07 14:10:10 -08:00
msabansal
679ee7a070
Fixed IP information not displayed properly in docker network inspect
...
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-03-07 13:20:42 -08:00
Santhosh Manohar
bb3c060954
Merge pull request #810 from aboch/se
...
Move exposed ports and port bindings from Endpoint to Sandbox
2016-03-06 16:25:57 -08:00
Santhosh Manohar
dd48b1c688
If anonymous container has alias names use it for DNS PTR record
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-03-06 10:46:40 -08:00
Santhosh Manohar
82f3d55fa4
Fix out of bound slice access in Delete()
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-03-06 10:03:03 -08:00
Alessandro Boch
1638fbdf27
Move exposed ports from Endpoint to Sandbox
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-06 09:31:26 -08:00
Alessandro Boch
747ea8e52b
Merge pull request #974 from sanimej/RR
...
Embedded DNS server to return multiple A records for enabling DNS Round Robin
2016-03-04 17:12:35 -08:00
Madhu Venugopal
d734bc5807
Merge pull request #958 from aboch/dc
...
Fix IPAM driver documentation
2016-03-03 18:14:28 -08:00
Madhu Venugopal
35baeffab6
Merge pull request #925 from aboch/ex
...
Fix iptables.Exists logic
2016-03-03 18:12:53 -08:00