Commit graph

2873 commits

Author SHA1 Message Date
Grant Millar
049966bdc2 Shorten controller ID in exec-root to not hit UNIX_PATH_MAX
Signed-off-by: Grant Millar <rid@cylo.io>
2019-08-28 18:59:49 +01:00
elangovan sivanandam
b8f02469bc Merge pull request #2440 from thaJeztah/bump_vendors
Bump hashicorp go-sockaddr v1.0.2, go-multierror v1.0.0
2019-08-26 12:48:27 -04:00
Sebastiaan van Stijn
55adbae783 bump hashicorp/go-sockaddr v1.0.2
full diff: 6d291a969b...v1.0.2

Relevant changes:
  - hashicorp/go-sockaddr#25 Add android os
  - hashicorp/go-sockaddr#28 Add go.mod

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 11:59:41 +02:00
Sebastiaan van Stijn
5ee62a9c70 bump hashicorp/go-multierror v1.0.0, add errwrap v1.0.0
full diff: fcdddc395d...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 11:52:15 +02:00
elangovan sivanandam
be6a639aca Merge pull request #2433 from icefed/fix-ipvs-parseip
Fix parseIP error when parseIP before get AddressFamily
2019-08-22 18:32:15 -04:00
Tom Zhao
7ab62b791f Fix parseIP error when parseIP before get AddressFamily
Signed-off-by: Tom Zhao <zlwangel@gmail.com>
2019-08-20 09:32:57 +08:00
elangovan sivanandam
65ade31ba1 Merge pull request #2434 from arkodg/bump-golang-1.12.8
Bumps the GO Version to 1.12.8 which contains security fixes
2019-08-15 23:06:18 -04:00
Arko Dasgupta
4818e89751 Bump the GO Version to 1.12.8 which contains security fixes
https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/golang-announce/65QixT3tcmg/DrFiG6vvCwAJ

Also pin to -stretch

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2019-08-15 15:40:33 -07:00
Arko Dasgupta
f79533d720 Revert "Apply load balancer properly"
This reverts commit 9f58c475940fb0c0d4b69de0af7787b62a40481f.
This commit is causing TestCreateParallel to be flaky

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2019-08-15 15:39:46 -07:00
elangovan sivanandam
885f8ff133 Merge pull request #2436 from arkodg/revert-syscall-reduction
Revert "Adjust LockOSThread"
2019-08-15 17:57:10 -04:00
Arko Dasgupta
9a4025d79f Revert "Adjust LockOSThread"
This reverts commit 94af1e5af2.

The reason to revert this is, that TestCreateParallel is
continously failing and breaking the CI

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2019-08-15 14:44:03 -07:00
elangovan sivanandam
5c9a062864 Merge pull request #2243 from fcrisciani/syscalls
Syscalls reduction
2019-07-31 17:57:15 -04:00
elangovan sivanandam
a79bbdb5f9 Merge pull request #2415 from arkodg/ipvlan-docker-restart-issue
Support dockerd and system restarts for ipvlan and macvlan networks
2019-07-26 13:04:34 -04:00
elangovan sivanandam
0acdd724ae Merge pull request #2420 from thaJeztah/golang_arg
Dockerfile: use GO_VERSION build-arg for overriding Go version
2019-07-25 22:47:14 -04:00
Arko Dasgupta
402efabec5 Remove vlanLinkExists and dummyLinkExists since these are redundant
Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2019-07-25 16:35:47 -07:00
elangovan sivanandam
50893512b5 Merge pull request #2351 from daym/fewer-modprobes
Use fewer modprobes
2019-07-25 16:18:00 -04:00
Arko Dasgupta
d22824dc11 Move dummyLinkExists into createDummyLink
Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2019-07-24 17:06:04 -07:00
Sebastiaan van Stijn
5fa03a4a8e Dockerfile: use GO_VERSION build-arg for overriding Go version
This allows overriding the version of Go without making modifications in the
source code, which can be useful to test against multiple versions.

For example:

    make GO_VERSION=1.13beta1 build

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-18 11:01:07 +02:00
Arko Dasgupta
ddd22a8198 Support dockerd and system restarts for ipvlan and macvlan networks
This commit carries forward the work done in
https://github.com/docker/libnetwork/pull/2295
and fixes two things
1. Allows macvlan and ipvlan to be restored properly
after dockerd or the system is restarted
2. Makes sure the refcount for the configOnly network
is not incremented for the above case so this network
can be deleted after all the associated ConfigFrom networks
are deleted

Addresses: https://github.com/docker/libnetwork/issues/1743

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
2019-07-15 15:37:21 -07:00
elangovan sivanandam
d07c890b48 Merge pull request #2414 from lemrouch/2413-fix
Allow network with --config-from to be --internal
2019-07-15 16:24:19 -04:00
elangovan sivanandam
43b7bc99dc Merge pull request #2411 from lemrouch/2410-fix
Macvlan network handles netlabel.Internal wrong
2019-07-15 12:37:29 -04:00
Pavel Matěja
12a182e937 Ipvlan network handles netlabel.Internal wrong
check value of netlabel.Internal not just it's existence

Signed-off-by: Pavel Matěja <pavel@verotel.cz>
2019-07-15 10:15:53 +02:00
elangovan sivanandam
4779705fb0 Merge pull request #2416 from herrwagner/2289-fix-ipv6-hardcode
Fix hardcoded AF_INET for IPv6 address handling
2019-07-12 06:37:36 -07:00
Tim Wagner
d132acb485 Fix hardcoded AF_INET for IPv6 address handling
Signed-off-by: Tim Wagner <tim.wagner@freenet.ag>
2019-07-11 08:22:10 +02:00
Pavel Matěja
afcb9fb299 Allow network with --config-from to be --internal
The --internal netlabel is discarded now.

Signed-off-by: Pavel Matěja <pavel@verotel.cz>
2019-07-08 15:34:08 +02:00
elangovan sivanandam
84fdfbdae3 Merge pull request #2412 from tiborvass/vendor-netns-riscv64
vendor: update netns to 7109fa855
2019-06-27 22:59:28 -04:00
Tibor Vass
ecc7bd0540 vendor: update netns to 7109fa855
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-06-27 22:26:46 +00:00
Pavel Matěja
e5353649f6 Macvlan network handles netlabel.Internal wrong
check value of netlabel.Internal not just it's existence

Signed-off-by: Pavel Matěja <pavel@verotel.cz>
2019-06-27 15:53:57 +02:00
Euan Harris
46bed879da Merge pull request #2231 from msabansal/winnetwork
Add support for Internal and Private network types on windows
2019-06-27 11:23:32 +01:00
Euan Harris
587783fb82 Merge pull request #1656 from huikang/remove-unused-testcode
Removed unused integration test code
2019-06-27 09:57:12 +01:00
Euan Harris
92611bb5f7 Merge pull request #2408 from euanh/golang-1.12.6
Update to Golang 1.12.6
2019-06-27 09:46:29 +01:00
Euan Harris
3eeda3d91c Dockerfile: Update to Go 1.12.6, matching moby/moby
Signed-off-by: Euan Harris <euan.harris@docker.com>
2019-06-26 16:54:53 +01:00
Euan Harris
84414583f0 gofmt: Fix formatting warnings
Signed-off-by: Euan Harris <euan.harris@docker.com>
2019-06-26 16:54:31 +01:00
Euan Harris
746e680871 vet: Fix format string warnings
Signed-off-by: Euan Harris <euan.harris@docker.com>
2019-06-26 16:51:22 +01:00
Euan Harris
0275b007c6 vet: Fix composite literal uses unkeyed fields warnings
Signed-off-by: Euan Harris <euan.harris@docker.com>
2019-06-26 16:50:56 +01:00
Euan Harris
3780098cd6 Merge pull request #2389 from tonistiigi/bridge-riscv
bridge: add riscv64 build tags
2019-06-26 15:34:02 +01:00
Tonis Tiigi
75bc82fe5c bridge: add riscv64 build tags
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-06-26 11:11:15 +08:00
Euan Harris
5c8048b363 Merge pull request #2404 from smarkm/master
Remove roadmap link from README.md
2019-06-25 15:24:14 +01:00
Euan Harris
1e476e7de6 Merge pull request #2365 from thaJeztah/fix_loadIPAMDriver_error_handling
controller.loadIPAMDriver: Unwrap error type returned by PluginGetter
2019-06-25 15:15:45 +01:00
Euan Harris
c3d402cef3 Merge pull request #2403 from thaJeztah/carry_2370_sctp_update
[carry 2370] Update sctp package
2019-06-25 15:11:50 +01:00
Euan Harris
d297a25283 Merge pull request #1723 from sebradloff/patch-1
Change wording for Endpoint description
2019-06-25 15:09:04 +01:00
Euan Harris
c0c586aacb Merge pull request #2279 from mrbeskin/clarify-design-doc
clarifications and typo fixes for the design documentation
2019-06-25 15:07:57 +01:00
Smark
1f1d9898c9 road map loss tracing, just keep use 'Design' describe the 'Future'
Signed-off-by: Smark <smark@freecoop.net>
2019-06-25 22:06:30 +08:00
smark
3ba3118873 Merge pull request #1 from docker/master
up to date
2019-06-25 21:31:28 +08:00
Sascha Grunert
c5c8653912 Update sctp package
This commit updates the vendored ishidawataru/sctp and adapts its used
types.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-24 17:26:33 +02:00
Sebastiaan van Stijn
1425fd4fcc controller.loadIPAMDriver: Unwrap error type returned by PluginGetter
moby/moby commit b27f70d45 wraps the ErrNotFound error returned when
a plugin cannot be found, to include a backtrace.   This changes the
type of the error, so contoller.loadIPAMDriver no longer converts it
to a libnetwork plugin.NotFoundError.

This is a similar patch as was merged in 9b114971e5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-24 16:40:51 +02:00
Euan Harris
d9ac962114 Merge pull request #2396 from mavenugo/um
Maintainers update
2019-06-24 15:25:30 +01:00
Euan Harris
0286b0155d Merge pull request #2366 from thaJeztah/bump_netlink_1.0
Bump vishvananda/netlink to 1.0.0
2019-06-24 14:27:39 +01:00
Sebastiaan van Stijn
e9e18d993c bump github.com/vishvananda/netns 13995c7128ccc8e51e9a6bd2b551020a27180abd
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-24 14:56:52 +02:00
Sebastiaan van Stijn
d152888722 Bump vishvananda/netlink to 1.0.0
Changes included:

- Allow index specification at link creation time
- replace syscall with golang.org/x/sys/unix
  - related: Use IFF_MULTI_QUEUE from x/sys/unix to define TUNTAP_MULTI_QUEUE
  - related: Use IFLA_* constants from x/sys/unix
- Fix index out of range when no metadata for gretap
- added encapsulation attributes for Iptun and Sittun to support SIT tunnels
- Expose xfrm state's statistics
- Support invert in ip rules
- Support LWTUNNEL_ENCAP_SEG6
- Support setting and retrieving route MTU/AdvMSS
- Fix CalcRtable array parameter bug
- added support for Foo-over-UDP netlink calls
- Support num{tx,rx}queues and udp6zerocsum{tx,rx}
- tuntap: Add multiqueue support
- Retrieve VLAN ID when listing neighbour
- Fix LinkAdd for sit tunnel on 3.10 kernel
- Add support for managing source MACVLANs
- Two functions: one for adding bond slave, one for getting veth peer index
- Eliminate cgo from netlink
- Don't overwrite the XDP file descriptor with flags
- Fix reference to BPF instructions (on Kernel 4.13)
- Add Matchall filter
- Send IFA_CACHEINFO when setting up addresses
- Support IPv6 GRE Tun and Tap
- Add List option to RouteSubscribeWithOptions, AddrSubscribeWithOptions, and LinkSubscribeWithOptions
- Add Fq and Fq_Codel Qdisc support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-06-24 14:56:49 +02:00