kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
1689 commits 10 branches 356 tags 299 MiB
Commit graph

1689 commits

Author SHA1 Message Date
Madhu Venugopal
5fee2c5be9 Merge pull request from sanimej/sd 
Update service DB on deletion of containers in bridge networks
 2016-07-22 17:51:28 -07:00
Madhu Venugopal
d6fefd1ad8 Merge pull request from aboch/lk 
Lock in isAgent() and inMaster()
 2016-07-22 17:50:39 -07:00
Santhosh Manohar
902ead3109 Update service DB on deletion of containers in bridge networks 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-07-22 14:51:36 -07:00
Alessandro Boch
3c36b06cb3 Lock in isAgent() and inMaster() 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-22 14:21:28 -07:00
Madhu Venugopal
605ecdd099 Merge pull request from aboch/restart 
Save the controller config on config reload
 2016-07-21 15:41:31 -07:00
Alessandro Boch
43df8050ba Merge pull request from ericho/macvlan-doc-typos 
Fix several typos on macvlan docs
 2016-07-21 13:24:56 -07:00
Alessandro Boch
47c071b654 Save the controller config on config reload 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-21 12:09:07 -07:00
Alessandro Boch
6b486d88e6 Merge pull request from mavenugo/adv-addr 
Add advertise-addr support
 2016-07-21 09:51:51 -07:00
Madhu Venugopal
6368406c26 Adding Advertise-addr support 
With this change, all the auto-detection of the addresses are removed
from libnetwork and the caller takes the responsibilty to have a proper
advertise-addr in various scenarios (including externally facing public
advertise-addr with an internal facing private listen-addr)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-07-21 02:44:25 -07:00
Madhu Venugopal
46caa4c813 Merge pull request from aboch/sec 
Adjust container's veth MTU when encryption is on
 2016-07-21 01:43:18 -07:00
Alessandro Boch
c0864059a7 Merge pull request from mavenugo/execroot 
Make osl sandbox basepath configurable using --exec-root configuration
 2016-07-20 18:28:21 -07:00
Madhu Venugopal
9b822c3fc6 Merge pull request from aboch/aead 
Use Authenticated Encryption for dataplane encryption
 2016-07-20 17:36:31 -07:00
Alessandro Boch
6aa25f33d4 Adjust container's veth MTU when encryption is on 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-20 17:13:05 -07:00
Alessandro Boch
5a38961bc9 Merge pull request from vladqa/mutex-svc-records 
added mutex on read from controller.svcRecords map
 2016-07-20 13:02:12 -07:00
Alessandro Boch
ddff1b5a87 Use fnv1-a to construct the SPI 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-20 12:50:33 -07:00
Vladislav Kolesnikov
7301999c2a added locks for all other accesses to controller.svcRecords 
Signed-off-by: Vladislav Kolesnikov <vkolesnikov@beget.ru>
 2016-07-20 19:49:59 +03:00
Vladislav Kolesnikov
1e0c61c3a2 added mutex on read from controller.svcRecords map 
Signed-off-by: Vladislav Kolesnikov <vkolesnikov@beget.ru>
 2016-07-20 17:28:32 +03:00
Erich Cordoba
829a4ee4be Fix several typos on macvlan docs 
Signed-off-by: Erich Cordoba <erich.cm@yandex.com>
 2016-07-19 21:14:57 -05:00
Alessandro Boch
253c103b8c Use aead for dataplane encryption 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-19 11:48:28 -07:00
Alessandro Boch
d8ef832bc1 Merge pull request from polachok/retry 
Actually retry LinkSetUp
 2016-07-19 08:24:53 -07:00
Alexander Polakov
daf4c97f7a Actually retry LinkSetUp 
Signed-off-by: Alexander Polakov <plhk@sdf.org>
 2016-07-19 14:20:45 +03:00
Alessandro Boch
ae3f09faeb Merge pull request from coolljt0725/remove_ip_endpoint 
ipvlan: remove endpoint from network on deleting endpoint
 2016-07-18 22:02:24 -07:00
Lei Jitang
744d5332bd ipvlan: remove endpoint from network on deleting endpoint 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-07-19 00:06:46 -04:00
Madhu Venugopal
7b470ea14d Merge pull request from coolljt0725/fix_update_endpoint_cnt 
Fix update endpoint count to store
 2016-07-18 13:54:42 -07:00
Madhu Venugopal
25f0573785 Make osl sandbox basepath configurable via execroot. 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-07-18 05:14:39 -07:00
Alessandro Boch
0b0678677f Update vishvananda/netlink to e73bad4 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-17 21:32:53 -07:00
Alessandro Boch
4f2efd3db3 Merge pull request from mavenugo/extkey 
Moving the UDS file out of /var/lib/docker and into /run/
 2016-07-15 14:04:56 -07:00
Madhu Venugopal
32e08e7700 Moving the UDS file out of /var/lib/docker and into /run/ 
the UDS sock is an unique file and the lifetime of it is until the
docker daemon dies (gracefully). Hence there is no need for it to be
under /var/lib and not mandatory to be configurable either.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-07-15 13:38:23 -07:00
Lei Jitang
4999c5707d Fix endpoint cnt decline overflow 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-07-14 22:52:44 -04:00
Lei Jitang
804f93bdff Fix update endpoint cnt to store 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-07-14 22:51:06 -04:00
Madhu Venugopal
cc69d2452c Merge pull request from aboch/ovcn 
Overlay driver to cleanup stale endpoints
 2016-07-14 13:23:55 -07:00
Alessandro Boch
46f525c7d6 Overlay driver to cleanup stale endpoints 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-13 10:56:57 -07:00
Madhu Venugopal
68e53443c9 Merge pull request from aboch/sbr 
Return proper error types on sandbox creation
 2016-07-12 21:33:30 -07:00
Alessandro Boch
2e88dfa406 Return proper error types on sandbox creation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-12 21:02:10 -07:00
Alessandro Boch
8fbad4ba05 Merge pull request from mavenugo/secaddr 
Add Virtual-IP of an endpoint as a secondary IP
 2016-07-12 20:03:14 -07:00
Madhu Venugopal
5e5a1778d2 Merge pull request from aboch/bcastq 
On agent init, re-join on existing cluster networks
 2016-07-12 18:49:17 -07:00
Alessandro Boch
d0192db0cd On agent init, re-join on existing cluster networks 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-07-12 17:35:32 -07:00
Madhu Venugopal
f0292e04b8 Add Virtual-IP of an endpoint as a secondary IP 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-07-12 15:50:42 -07:00
Alessandro Boch
e4957174ee Merge pull request from mavenugo/nscope 
manage network dynamic flag appropriately under various scenarios
 2016-07-12 10:00:20 -07:00
Alessandro Boch
918c6052ae Merge pull request from LK4D4/no_debug_on_empty 
networkdb: do nothing in bulkSync if nodes is empty
 2016-07-12 09:38:04 -07:00
Madhu Venugopal
9d01c1fcd5 manage network dynamic flag appropriately under various scenarios 
If a network is dynamic, make sure the scope of the object doesnt change
based on the cluster-mode

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-07-12 08:57:50 -07:00
Alexander Morozov
af3158ecdb networkdb: do nothing in bulkSync if nodes is empty 
This patch allows getting rid of annoying debug message.

Signed-off-by: Alexander Morozov <lk4d4math@gmail.com>
 2016-07-11 09:11:07 -07:00
Alessandro Boch
10aec4d8f0 Merge pull request from alindeman/bridge-conflict-panic 
Avoids panic when checking for conflicts against an uninitalized network
 2016-07-07 09:55:11 -07:00
Andy Lindeman
f2ae8467e3 Avoids panic when checking for conflicts against an uninitalized network 
A network is added to the `d.networks` map before it's fully initialized. That
is, it's possible for a network in `d.networks` to exist without having
`bridgeIPv4` populated yet. If multiple networks are spun up close to the same
time, a panic can occur.

Example:
```
panic(0x1a75d20, 0xc82000e090)
        /usr/local/go/src/runtime/panic.go:443 +0x4e9
net.networkNumberAndMask(0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0)
        /usr/local/go/src/net/ip.go:433 +0x42
net.(*IPNet).Contains(0x0, 0xc82084dbd0, 0x4, 0x4, 0xc820010200)
        /usr/local/go/src/net/ip.go:457 +0x25
github.com/docker/libnetwork/drivers/bridge.(*networkConfiguration).conflictsWithNetworks(0xc822249360, 0xc822761380, 0x40, 0xc820866a60, 0x4, 0x4, 0x0, 0x0)
        /root/rpmbuild/BUILD/docker-engine/vendor/src/github.com/docker/libnetwork/drivers/bridge/bridge.go:334 +0x40b
```

Signed-off-by: Andy Lindeman <alindeman@salesforce.com>
 2016-07-07 11:27:12 -04:00
Madhu Venugopal
630e106529 Merge pull request from justincormack/proxy 
Make the docker proxy a standalone binary not a re-exec
 2016-07-06 11:38:06 -07:00
Alessandro Boch
83be979887 Merge pull request from mavenugo/drvRegIpam 
Moving IPAM initalization out of drvRegistry into libnetwork core
 2016-07-05 17:56:47 -07:00
Madhu Venugopal
576267bfb9 Moving IPAM initalization out of drvRegistry into libnetwork core 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-07-05 16:42:34 -07:00
Madhu Venugopal
68be2ca7e4 Merge pull request from dmcgowan/fix-fd-leaks 
Fix file descriptor leaks
 2016-07-05 14:07:04 -07:00
Justin Cormack
5202f95604 Make the docker proxy a standalone binary not a re-exec 
Rather than re-execing docker as the proxy, create a new command docker-proxy
that is much smaller to save memory in the case where there are a lot of
procies being created. Also allows the proxy to be replaced, for example
in Docker for Mac we have a proxy that proxies to osx instead of locally.

This is the vendoring pull for https://github.com/docker/docker/pull/23312

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-04 13:17:16 +01:00
Derek McGowan
ccabedfbe3 Fix file descriptor leaks 
Ensures network connections and file are closed when done writing.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-07-01 16:29:51 -07:00