dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-10 16:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,061 Commits 19 Branches 583 Tags
6fdb2fb069b985f244eb227828b00a940ee9de84
Commit Graph

129 Commits

Author SHA1 Message Date
Ying Li
4509a001df Re-vendor swarmkit. This includes the following fixes: 
- https://github.com/docker/swarmkit/pull/2266 (support for templating Node.Hostname in docker executor)
- https://github.com/docker/swarmkit/pull/2281 (change restore action on objects to be update, not delete/create)
- https://github.com/docker/swarmkit/pull/2285 (extend watch queue with timeout and size limit)
- https://github.com/docker/swarmkit/pull/2253 (version-aware failure tracking in the scheduler)
- https://github.com/docker/swarmkit/pull/2275 (update containerd and port executor to container client library)
- https://github.com/docker/swarmkit/pull/2292 (rename some generic resources)
- https://github.com/docker/swarmkit/pull/2300 (limit the size of the external CA response)
- https://github.com/docker/swarmkit/pull/2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- https://github.com/docker/swarmkit/pull/2271
- https://github.com/docker/swarmkit/pull/2279
- https://github.com/docker/swarmkit/pull/2283
- https://github.com/docker/swarmkit/pull/2282
- https://github.com/docker/swarmkit/pull/2274
- https://github.com/docker/swarmkit/pull/2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
 2017-07-11 13:43:43 -07:00
Vincent Demeester
497e6e0caa Update go-connections dependency 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-24 12:40:49 +02:00
Sebastiaan van Stijn
9f5f3e49da Merge pull request #33738 from fcrisciani/libnetwork-vendoring 
Libnetwork vendoring
 2017-06-22 17:41:46 -07:00
Aaron Lehmann
79b940feee Vendor swarmkit 79381d0 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-06-21 15:32:53 -07:00
Flavio Crisciani
e1953f1ca7 Libnetwork vendoring 
Fixes in the Service Discovery areas

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-06-19 19:42:24 -07:00
Aaron Lehmann
32d7b0f360 Vendor swarmkit a4bf013 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-06-12 10:31:11 -07:00
Madhu Venugopal
6868b8ef23 Vendoring libnetwork f4a15a0890383619ad797b3bd2481cc6f46a978d 
Contains Service Discovery hardening fixes via
https://github.com/docker/libnetwork/pull/1796

Fixes multiple issues such as #32830

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-06-12 01:01:45 -07:00
Madhu Venugopal
5fd65a6b6c Vendoring libnetwork and netlink 
libnetwork eb57059e91bc54c9da23c5a633b75b3faf910a68
netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-06-07 06:20:27 -07:00
Madhu Venugopal
0484bdb6ca Vendoring libnetwork 2e99f06621c23a5f4038968f1af1e28c84e4104e 
Fixes #33415
Fixes #33346
Implemented few additional IPVS APIs to be used by other projects

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-05-31 16:04:00 -07:00
Aaron Lehmann
10df99f9ae Vendor swarmkit 7e096ced 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-23 15:01:35 -07:00
Aaron Lehmann
aa6fc939ba vendor: Remove docker-credential-helpers 
This appears to be a remnant from the CLI that is no longer imported
anywhere. Remove it from vendor.conf and the vendor directory.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-22 13:58:28 -07:00
Madhu Venugopal
9b0e1df4dd Vendoring libnetwork 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-05-18 15:14:12 -07:00
Abhinandan Prativadi
f3d8ff774e swarmkit vendoring 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-05-17 18:46:34 -07:00
Alessandro Boch
8daeeacfc1 Vendor swarmkit @998a47f 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
46392f2442 Vendoring libnetwork @b2bc1a6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Kenfe-Mickael Laventure
0ea0b2becf Use containerd Status variable when checking container state 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-15 10:53:51 -07:00
Aaron Lehmann
0a377b5f56 Update go-metrics to match swarmkit's dependency 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-12 17:40:46 -07:00
Aaron Lehmann
721b7a7fad Vendor swarmkit ae29cf2 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-12 17:36:11 -07:00
Flavio Crisciani
385176980e Libnetwork vendoring 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-05-10 21:16:57 -07:00
Flavio Crisciani
7ff9fb5f04 Libnetwork vendoring 
Fixes backward compatibility for memberlist

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-05-09 13:41:54 -07:00
Brian Goff
5122abeb44 Re-run vndr 
Now that the CLI is gone there are lots of packages that need to be
pruned from vendor.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-09 10:59:25 -04:00
Tibor Vass
4b846a125b Merge pull request #33059 from nishanttotla/vendor-swarmkit 
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
 2017-05-08 14:27:51 -07:00
Kenfe-Mickaël Laventure
7238cca42c Merge pull request #33007 from crosbymichael/containerd-rc5 
Update moby to containerd and runc 1.0 final rc
 2017-05-08 09:23:07 -07:00
Nishant Totla
1b68641fc8 Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-05-05 14:18:12 -07:00
Michael Crosby
005506d36c Update moby to runc and oci 1.0 runtime final rc 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-05 13:45:45 -07:00
Brian Goff
669f4ba37e Merge pull request #29554 from cpuguy83/keep_running_count_of_states 
Use counter for tracking container states
 2017-05-05 16:15:22 -04:00
Aaron Lehmann
077f08bf54 Vendor swarmkit 8f053c2 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-02 15:51:26 -07:00
Ian Campbell
a28d91349e Update to latest vndr c56e08229111 
Changes are:

$ git log --no-merges --oneline 19220953c4a4..c56e08229111
4b76270 Keep "vendor.conf" for reference
ac8f766 travis: update to go 1.8.1
c196644 Better validation of duplicates
e684d5e check for unused packages at the end
3ed2513 detect default gopath($HOME/go)
c9052f3 fix backtick in readme
0e04f23 Missing installation section in README

Changes to moby are the inclusion of several upstream vendor.conf files and
switching to vendoring the toplevel golang.org/x/sync package rather than the
syncmap sub-package due to:

2017/05/02 11:21:06 WARNING: package golang.org/x/sync/syncmap is not root import, should be golang.org/x/sync

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-05-02 11:23:36 +01:00
Brian Goff
e4c03623c2 Use counter for tracking container states 
Container state counts are used for reporting in the `/info` endpoint.
Currently when `/info` is called, each container is iterated over and
the containers 'StateString()' is called. This is not very efficient
with lots of containers, and is also racey since `StateString()` is not
using a mutex and the mutex is not otherwise locked.

We could just lock the container mutex, but this is proven to be
problematic since there are frequent deadlock scenarios and we should
always have the `/info` endpoint available since this endpoint is used
to get general information about the docker host.

Really, these metrics on `/info` should be deprecated. But until then,
we can just keep a running tally in memory for each of the reported
states.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-04-29 17:10:14 -04:00
Flavio Crisciani
44c3de8450 Libnetwork vendoring 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-28 13:17:44 -07:00
Flavio Crisciani
b96988feb9 Libnetwork vendoring 
Vendor libnetwork changes for --data-path-addr flag

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-26 15:33:13 -07:00
Aaron Lehmann
f2146cb74b Vendor swarmkit 61a92e8 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-14 10:20:58 -07:00
Ying Li
e34bee387e Re-vendor swarmkit to a version which does not require all cluster updates 
to include an external CA certificate when updating external CAs.

Signed-off-by: Ying Li <ying.li@docker.com>
 2017-04-12 16:55:47 -07:00
Flavio Crisciani
c16eb5f88a Vendoring Libnetwork library 
- adding conntrack flush fix for docker/docker#8795

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-10 17:52:16 -07:00
Sebastiaan van Stijn
2daa2b894c Merge pull request #31364 from adshmh/30935-use-encrypted-client-certificate-to-connect-to-a-docker-host 
use an encrypted client certificate to connect to a docker daemon
 2017-04-10 10:42:01 +02:00
Madhu Venugopal
9f27f0dcd3 Merge pull request #32447 from aboch/vnd 
Fix container no ipv6 when run container on --network=host
 2017-04-09 15:07:58 -07:00
Aaron Lehmann
ff06898930 Vendor swarmkit d5232280 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-07 17:10:16 -07:00
Alessandro Boch
60c36f88a5 Vendoring libnetwork @ab8f7e6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-04-07 16:35:29 -07:00
Vincent Demeester
87562af45b Merge pull request #32283 from aboch/clearingress 
Daemon to take care of ingress cleanup on cluster leave and graceful shutdown
 2017-04-07 20:09:27 +02:00
Arash Deshmeh
7180f887ea vendor docker/go-connections to include the enhacement for decrypting keys 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-04-07 01:50:50 -04:00
Andrea Luzzardi
367b57d985 Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2017-04-05 18:49:23 -07:00
Alessandro Boch
bf5bebdfa0 Vendoring libnetwork @f3c4ca8 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-04-05 16:31:28 -07:00
Alessandro Boch
747f0b4ba5 Vendoring swarmkit @b74ec2b 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-30 16:12:33 -07:00
Dong Chen
aac861f3d9 vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2017-03-28 11:51:33 -07:00
Alessandro Boch
ff049a4d4d Vendor libnetwork @b6cb1ee 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-24 11:07:33 -07:00
Alessandro Boch
434e9695e4 Vendoring swarmkit @9fdea50 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-24 11:07:33 -07:00
Victor Vieux
afe1c5c2eb Merge pull request #31705 from cyli/bump-go-connections 
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
 2017-03-21 10:36:41 -07:00
Madhu Venugopal
cdf66ba715 Merge pull request #31710 from sanimej/drillerrr 
Add verbose flag to network inspect to show all services & tasks in swarm mode
 2017-03-13 21:12:32 -07:00
Vincent Demeester
9dec486cf6 Update docker-credential-helpers to v0.5.0 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-13 21:08:41 +01:00
Santhosh Manohar
6708676464 Vendor libnetwork for network inspect --verbose changes 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-03-12 21:23:21 -07:00