Commit graph

2840 commits

Author SHA1 Message Date
Flavio Crisciani
482def9c58 Merge pull request #2079 from thaJeztah/bump-toml
vendor: update BurntSushi/toml for MIT license
2018-02-16 14:24:02 -08:00
Sebastiaan van Stijn
ba5b3ee8d9 Bump BurntSushi/toml for MIT License
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-16 13:17:40 +01:00
Sebastiaan van Stijn
71c0bc0b89 Revendor dependencies
re-vendor using vndr a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-16 13:17:02 +01:00
Flavio Crisciani
46284f8372 Merge pull request #1825 from ishidawataru/sctp
Support SCTP port mapping
2018-02-15 18:06:56 -08:00
Wataru Ishida
2120ed2363 Support SCTP port mapping
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-13 16:01:03 +09:00
Dani Louca
f5c62864e9 Make ssd portable and usuable outside the default image.
Add error check when network on a particular node has no services

Signed-off-by: Dani Louca <dani.louca@docker.com>
2018-02-12 17:02:01 -05:00
Flavio Crisciani
92888febdb Merge pull request #2071 from fcrisciani/ssd
Import the ssd tool in libnetwork
2018-02-10 09:52:40 -08:00
Flavio Crisciani
1484a5c19b Merge pull request #2070 from nwoodmsft/master
Added OutboundNAT policy support for Windows
2018-02-07 10:43:35 -08:00
Flavio Crisciani
a16d469867 Import the ssd tool in libnetwork
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-02-07 09:20:55 -08:00
Nick Wood
bbbfa21a94 libnetwork Windows driver support for outboundnat policy via generic options
Signed-off-by: Nick Wood <nwood@microsoft.com>
2018-02-05 17:07:26 -08:00
Flavio Crisciani
2459e6fbd3 Merge pull request #2032 from fcrisciani/debug-client
Diagnostic client
2018-01-29 11:06:21 -08:00
Flavio Crisciani
fd5cbfaaa4 Merge pull request #2065 from fcrisciani/ndots
Fix user specified ndots option
2018-01-29 11:03:44 -08:00
Flavio Crisciani
5a658d4cc1 Fix user specified ndots option
Setting ndots to 0 does not allow to resolve search domains
The default will remain ndots:0 that will directly resolve
services, but if the user specify a different ndots value
just propagate it into the container

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-01-26 10:07:08 -08:00
Flavio Crisciani
2f6921cbba Diagnostic client
- the client allows to talk to the diagnostic server and
decode the internal values of the overlay and service discovery

- the tool also allows to remediate in case of orphans entries

- added README

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-01-25 16:09:37 -08:00
Flavio Crisciani
a59ecd9537 Change diagnose module name to diagnostic
Align it to the moby/moby external api

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-01-25 16:09:29 -08:00
Flavio Crisciani
1eaa943f64 Merge pull request #2063 from thaJeztah/bump-go-1.9.3
Bump Go to 1.9.3
2018-01-24 11:00:45 -08:00
Flavio Crisciani
4bf50246d1 Merge pull request #2040 from fcrisciani/memberlist_revendor
Memberlist revendor and optimizations
2018-01-24 09:20:20 -08:00
Sebastiaan van Stijn
b6f640a9ff Bump Go to 1.9.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 00:30:38 -08:00
Flavio Crisciani
64da6b8889 Avoid delay on node rejoin, avoid useless witness
Avoid waiting for a double notification once a node rejoin, just
put it back to active state. Waiting for a further message does not
really add anything to the safety of the operation, the source of truth
for the node status resided inside memberlist.

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-01-23 16:21:18 -08:00
Flavio Crisciani
08f9dfeaf8 Merge pull request #2010 from madhanrm/hotaddfix
Fix to use ContainerID for windows instead of SanbdoxID
2018-01-23 15:08:46 -08:00
Flavio Crisciani
5f773281d2 Revendor memberlist
diff: https://github.com/hashicorp/memberlist/compare/v0.1.0...master

Relevant changes:
 - Calculates the timeout for dial using the deadline
 - Reduce LAN min suspicion multiplier
 - fix deadlock in shutdown process of memberlist

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-01-23 14:22:09 -08:00
Flavio Crisciani
e6df49bd21 Merge pull request #2053 from cpuguy83/reload_user_chain
Reload DOCKER-USER chain on firewalld reload.
2018-01-12 09:30:11 -08:00
Brian Goff
d5fef4ca1c Reload DOCKER-USER chain on frewalld reload.
Relates to moby/moby#35043

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-01-12 10:50:22 -05:00
Flavio Crisciani
f9a14ba9dc Merge pull request #2051 from fcrisciani/fix-watchMiss-ns
Fix watchMiss thread context
2018-01-10 16:18:35 -08:00
Flavio Crisciani
e975f3caa0 Fix watchMiss thread context
The netlink deserialize is fetching information from the link.
This require the go routine to be in the correct namespace to
succeed

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-01-10 13:50:49 -08:00
Flavio Crisciani
93f8337ec9 Merge pull request #1824 from abhi/rolling_update
Delete service info from cluster when service is disabled
2018-01-09 14:29:52 -08:00
abhi
5ab37a55a1 Delete service info from cluster when service is disabled
This PR contains a fix for moby/moby#30321. There was a moby/moby#31142
PR intending to fix the issue by adding a delay between disabling the
service in the cluster and the shutdown of the tasks. However
disabling the service was not deleting the service info in the cluster.
Added a fix to delete service info from cluster and verified using siege
to ensure there is zero downtime on rolling update of a service.

Signed-off-by: abhi <abhi@docker.com>
2018-01-09 13:53:00 -08:00
Flavio Crisciani
e8f62679a3 Merge pull request #1995 from fcrisciani/fix-ndots
Fix ndots configuration
2018-01-09 09:22:57 -08:00
Flavio Crisciani
c5a734c2eb Merge pull request #2047 from fcrisciani/remove_watchmiss
Remove watchMiss for swarm mode
2018-01-09 09:01:23 -08:00
Flavio Crisciani
af7fa2d7a2 Merge pull request #2041 from ddebroy/2026mx
Handle DNS queries of type MX
2018-01-09 08:57:00 -08:00
Deep Debroy
88df74659a Add unit tests for MX and A DNS queries
Signed-off-by: Deep Debroy <ddebroy@docker.com>
2018-01-08 17:08:48 -08:00
Flavio Crisciani
dd47466a4d Remove watchMiss for swarm mode
Swarm mode does not really have anymore a use for the watchMiss.
Peer entries are configured at configuration time.
If the gcthresh denies the insertion the peerAdd will fail.

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-01-05 14:51:43 -08:00
Flavio Crisciani
944540495b Merge pull request #2043 from selansen/master
Enable IPV6 config on Sandbox creation on live-restore case
2018-01-02 12:08:00 -08:00
selansen
d28d679080 Enable IPV6 config on Sandbaox creation on live-restore
In sandbox creation we disable IPV6 config. But this causes problem in live-restore case
where all IPV6 configs are wiped out on running container. Hence extra check has been added
take care of this issue.

Signed-off-by: selansen <elango.siva@docker.com>
2017-12-27 23:32:29 -05:00
selansen
e7646397b0 Merge branch 'master' of https://github.com/docker/libnetwork 2017-12-27 22:37:24 -05:00
Flavio Crisciani
d47da49ccb Merge pull request #2042 from jongwu/dockerfile.patch
enable unit test in arm64
2017-12-27 22:22:58 -05:00
Flavio Crisciani
e48d811bc6 Merge pull request #2042 from jongwu/dockerfile.patch
enable unit test in arm64
2017-12-21 08:55:46 -07:00
Jianyong Wu
fe032eeb07 change base image version in Dockerfile.build to enable unit test in arm64 for multi-arch image issue
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
2017-12-21 16:33:07 +08:00
Deep Debroy
6a4c8d0ac9 Handle DNS querries of type MX
Signed-off-by: Deep Debroy <ddebroy@docker.com>
2017-12-20 14:32:47 -08:00
Madhu Venugopal
00bb02b36c Merge pull request #2035 from fcrisciani/netdb-realign-test-infra
Consolidate node management logic
2017-12-13 11:20:18 -08:00
Flavio Crisciani
b190ee3ccf Cleanup node management logic
Created method to handle the node state change with cleanup operation
associated.
Realign testing client with the new diagnostic interface

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-12-13 09:40:38 -08:00
Flavio Crisciani
a6b9d7baf5 Merge pull request #2024 from selansen/master
moved updateToStore call in CreateEndPoint before we call addEndpoint
2017-12-12 21:34:46 -08:00
Flavio Crisciani
7b146b3443 Merge pull request #2021 from soccerGB/disable_gatewaydns
Added a new network creation driver option (disable_gatewaydns) for t…
2017-12-12 21:32:05 -08:00
selansen
66b65b471a VETH interface cleanup when dockerD suddenly crashes
VETH interface was not cleaned up when DockerD got killed between addEndpoint and updateToStore calls.
I have added logs and made sure calling updateToStore before addEndpoint contains same values.
Hence moving up the call looks safer and VETH gets cleaned up even after DockerD gets killed in the middle.

Signed-off-by: selansen <elango@docker.com>
2017-12-12 13:14:31 -08:00
Flavio Crisciani
3e99131f55 Merge pull request #1916 from msabansal/fixcidr
Docker deamon doesn't work with --fixed-cidr on windows
2017-12-08 11:25:58 -08:00
Flavio Crisciani
6a350429fb Merge pull request #2014 from msabansal/icsdnsissue
Fix for docker intercepting DNS requests on ICS network
2017-12-07 12:59:59 -08:00
Madhu Venugopal
b1ff9f5acb Merge pull request #1918 from fcrisciani/bridge-crash
Fix concurrent CreateNetwork in bridge driver
2017-12-05 17:40:26 -08:00
Madhu Venugopal
17e663942a Merge pull request #2030 from fcrisciani/change-server
Call the Shutdown on the server
2017-12-05 17:16:18 -08:00
Flavio Crisciani
8c21351e3e Changed the name of the server pointer
Changed the pointer name and added a comment

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-12-05 13:45:08 -08:00
Flavio Crisciani
1a2efea39e Call the Shutdown on the server
This is the right way to call for a clean shutdown

Return application/json as content-type when appropriate

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-12-05 13:17:42 -08:00