1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

2619 commits

Author SHA1 Message Date
Siarhei Rasiukevich
fe9a5a225d Fix net driver response loss on createEndpoint
Fix related to bug: https://github.com/docker/for-linux/issues/348
We should perform updateToStore(ep) after n.addEndpoint or do update twice,
otherwise response from network plugin will not be written to KV storage.
This results in container creation with broken network config.

Signed-off-by: Siarhei Rasiukevich <raskintech@gmail.com>
2018-06-26 13:27:47 +03:00
Flavio Crisciani
d9b5aa4c86 Merge pull request from fcrisciani/netdb-test
Add retry to cluster-peers
2018-06-25 11:54:52 -07:00
Flavio Crisciani
9140372ec3 Merge pull request from fcrisciani/ignore
Added back dockerignore
2018-06-25 11:53:47 -07:00
Flavio Crisciani
62ebaeac7a Added back dockerignore
Try to reduce the docker context for the build

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-06-22 16:10:22 -07:00
Flavio Crisciani
28ec64d2e5 Merge pull request from euanh/update-vendoring
Update vendoring to match moby/moby
2018-06-22 08:17:39 -07:00
Chris Telfer
755ef5bf29 Merge pull request from fcrisciani/support
Add auto update to support.sh
2018-06-21 17:02:26 -04:00
Flavio Crisciani
4f3fb7ee6a Add retry to cluster-peers
Add retry field to cluster-peers probe

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-06-21 13:08:04 -07:00
Euan Harris
705bf07f05 vendor.conf: Update vendored components to match moby
* Update dependencies to match moby master; add new sub-dependencies
  as necessary.

* Update moby to latest

* Update gocapability

  This moves gocapability beyond the version vendored in moby;
  presumably the code which requires this particular version
  is not used in moby and is removed by vndr.   Moby will need
  to be updated as well.

Signed-off-by: Euan Harris <euan.harris@docker.com>
2018-06-21 15:16:21 +01:00
Euan Harris
9b114971e5 controller: 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.loadDriver no longer converts it to a
libnetwork plugin.NotFoundError.  This causes a couple of tests which
inspect the return type to fail;  most code only checks whether the
error is non-nil and is not affected by the change in type.

Signed-off-by: Euan Harris <euan.harris@docker.com>
2018-06-21 15:08:25 +01:00
Flavio Crisciani
5de876c7ae Add auto update to support.sh
Before running the support script
try to fetch the latest version

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-06-20 15:29:45 -07:00
Flavio Crisciani
6716626d32 Merge pull request from thaJeztah/update_miekd_dns
Update miekg/dns to v1.0.7
2018-06-20 14:31:49 -07:00
Flavio Crisciani
8282efa3d7 Merge pull request from fcrisciani/support
Create support as a container
2018-06-20 14:24:24 -07:00
Flavio Crisciani
9dbf55097a Create support as a container
Containerize support.sh

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-06-20 14:05:14 -07:00
Flavio Crisciani
3a5f106ec3 Merge pull request from fcrisciani/circle-multistage
Multistage for build
2018-06-19 21:58:45 -07:00
Flavio Crisciani
8f1fca3e66 Multistage for build
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-06-19 21:51:11 -07:00
Flavio Crisciani
c548093db6 Merge pull request from euanh/bump-go-version
Dockerfile.build: Bump Go to 1.10.2
2018-06-19 09:24:11 -07:00
Flavio Crisciani
8dd7572a4c Merge pull request from selansen/circle2.0
Migration from CircleCI1.0 to CircleCI2.0
2018-06-19 09:23:34 -07:00
Euan Harris
24bdb26483 Dockerfile.build: Bump Go to 1.10.2
This brings libnetwork up to date with moby/moby.

Signed-off-by: Euan Harris <euan.harris@docker.com>
2018-06-19 14:07:58 +01:00
Flavio Crisciani
803f882770 Merge pull request from abhi/master
Fixing the unit test for overlapping subnet
2018-06-18 12:48:20 -07:00
Abhinandan Prativadi
f5fa40f9aa Fixing the unit test for overlapping subnet
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2018-06-18 12:31:48 -07:00
Flavio Crisciani
59a2ef7843 Merge pull request from fcrisciani/go-sockaddr-vndr
Vendor go-sockaddr
2018-06-18 11:37:12 -07:00
Flavio Crisciani
828a6d788e Merge pull request from ctelfer/subnet-cursor
Avoid reusing subnets when allocating from pools
2018-06-18 11:23:11 -07:00
Flavio Crisciani
891fb82213 Merge pull request from abhi/ipam-check
Adding a check for subnet pool overlap
2018-06-18 11:19:41 -07:00
Flavio Crisciani
c7300fec17 Merge pull request from euanh/portbinding-ipv6
types: Handle IPv6 literals correctly in port bindings
2018-06-18 09:19:48 -07:00
Flavio Crisciani
48196df4a2 Further makefile cleanup
- cleaned the make check
- local build do not require context

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-06-16 11:03:11 -07:00
selansen
fbf02c3794 Migration from CircleCI1.0 to CircleCI2.0
This commit will allow us to use newer version of CircleCI.

Signed-off-by: selansen <elango.siva@docker.com>
2018-06-16 11:03:11 -07:00
Flavio Crisciani
c19cc28bd8 Merge pull request from trapier/support_sh_add_links
support.sh: add host links
2018-06-15 08:58:38 -07:00
Trapier Marshall
bef873c9df support.sh: add host links
also made the heading for host iptables state clearer

Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2018-06-13 16:27:54 -04:00
Chris Telfer
e31e906e4e Add pool reuse test to unit tests
Add a test to confirm that the pool allocator will iterate through all
the pools even if some earlier ones were freed before coming back to
previously allocated pools.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-06-08 19:26:10 -04:00
Chris Telfer
cc8b2cac28 Allocate subnets in order rather than restarting
This commit prevents subnets from being reused at least initially,
instead favoring to cycle through them as we do with addresses within a
subnet.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-06-08 19:26:04 -04:00
Flavio Crisciani
5f23795eef Merge pull request from ctelfer/fix-overlay-deadlock-regression
Fix spurious deadlock in overlay driver
2018-06-08 13:38:34 -07:00
Flavio Crisciani
821a51db18 Merge pull request from fcrisciani/race-ingress
Possible race on ingress programming
2018-06-08 13:37:58 -07:00
Chris Telfer
f0c86fb56e Fix deadlock introduced in b64997ea
Commit b64997ea prevented data corruption due to simultaneous
driver.CreateNetwork()/driver.DeleteNetwork() by holding the network
lock through the read/modify part of the operation.  However, part of
the DeleteNetwork operation entails sending a message to the peerDB to
tell that goroutine to flush entries on deletion.  This can lead to a
deadlock where:
  * driver.DeleteNetwork() starts and acquires driver.Lock()
  * peerDB receives some other request (e.g. EventNotify) and blocks
    on driver.Lock()
  * driver.DeleteNetwork() attempts a peerDB flush and blocks waiting
    on the synchronous peerDB operation channel

This patch fixes the issue by deferring the peerDB flush operation until
after DeleteNetwork() unlocks driver.Lock().   Commit b64997ea only
modified CreateNetwork() and DeleteNetwork() and the critical section
that driver.Lock() protects in CreateNetwork() does not perform any
peerDB notifications or other locks of driver data structures.  So this
solution should be a complete fix for any regressions introduced in
b64997ea.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-06-08 14:17:51 -04:00
Flavio Crisciani
3d2b2f1c7e Possible race on ingress programming
Make sure that iptables operations on ingress
are serialized.
Before 2 racing routines trying to create the ingress chain
were allowed and one was failing reporting the chain as
already existing.
The lock guarantees that this condition does not happen anymore

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-06-07 13:02:04 -07:00
Sebastiaan van Stijn
01e6a24545 Update miekg/dns to v1.0.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-01 16:32:04 +02:00
Flavio Crisciani
9310db12ae Merge pull request from ctelfer/remove-net-attach-info
Remove non-service cluster info on sbLeave
2018-05-31 13:31:20 -07:00
Chris Telfer
c4d507b566 Remove non-service cluster info on sbLeave
The system should remove cluster service info including networkDB
entries and DNS entries for container endpoints that are not part of a
service as well as those that are part of a service.  This used to be
the normal sequence of operations but it moved to
sandbox.DisableService() in an effort to more gracefully handle endpoint
removal from a service (which proved insufficient).  Unfortunately
subsequent changes also removed the newly-mandetory call to
sandbox.DisableService() preventing proper cleanup for non-service
container endpoints.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-05-31 14:21:55 -04:00
Chris Telfer
147912afad Merge pull request from cziebuhr/2093-iface_order2
Improve interface order
2018-05-30 12:26:38 -04:00
Euan Harris
e3c212c224 types: Handle IPv6 literals correctly in port bindings
Use net.splitHostPort() instead of our own logic in func (p *PortBinding)
FromString(s string) error.   This means that IPv6 literals, including
IPv4 in IPv6 literals, can now be parsed from the string form of
PortBindings.   Zoned addresses do not work - net.splitHostPort() parses
them but net.ParseIP() cannot and returns an error.   This is ok because
we do not have a slot to store the zone name in PortBinding anyway.

Signed-off-by: Euan Harris <euan.harris@docker.com>
2018-05-30 16:12:19 +01:00
Flavio Crisciani
185a889a82 Merge pull request from fcrisciani/fix-typo
Fix type in error message
2018-05-29 09:43:54 -07:00
Flavio Crisciani
328948d35a Fix type in error message
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-05-29 08:56:49 -07:00
Flavio Crisciani
a1c61ab794 Merge pull request from fcrisciani/networkdb-test-image
Enable network-db test image creation
2018-05-29 08:47:28 -07:00
Flavio Crisciani
87d6ce3d5a Merge pull request from idealhack/typo
typo: fix misspells in code and comments
2018-05-29 08:45:48 -07:00
Flavio Crisciani
1784a46e64 Enable network-db test image creation
Updated makefile
Moved binaries in the bin/ directory

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-05-29 08:03:32 -07:00
Chris Telfer
55567d88e4 Merge pull request from idealhack/tests
test: fix ineffectual assignments
2018-05-29 10:51:23 -04:00
Yang Li
f6d9d22e6f test: fix ineffectual assignments
Signed-off-by: Yang Li <idealhack@gmail.com>
2018-05-29 18:08:32 +08:00
Yang Li
f9f3b1bdeb typo: fix misspells in code and comments
Signed-off-by: Yang Li <idealhack@gmail.com>
2018-05-29 17:08:41 +08:00
Christoph Ziebuhr
67dbb04852 Improve interface order
Signed-off-by: Christoph Ziebuhr <chris@codefrickler.de>
2018-05-25 17:40:32 +02:00
Flavio Crisciani
350fc8fc17 Merge pull request from euanh/shell-needs-build-image
Makefile: build image is a prerequisite of the shell target
2018-05-25 07:54:43 -07:00
Euan Harris
e7fcca2f9f Makefile: build image is a prerequisite of the shell target
Signed-off-by: Euan Harris <euan.harris@docker.com>
2018-05-25 15:43:08 +01:00