f104371302
Vendor swarmkit a4bf013
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 32d7b0f3601258edf94ecf0e2e9018a406846888
Component: engine
2017-06-12 10:31:11 -07:00
3f80d858fd
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 >
Upstream-commit: 6868b8ef230fea7bc5758e2d252d4297033029fa
Component: engine
2017-06-12 01:01:45 -07:00
af043a1e5b
Vendoring libnetwork and netlink
...
libnetwork eb57059e91bc54c9da23c5a633b75b3faf910a68
netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 5fd65a6b6c524e670f3b4ccced3974f63c1fd9a6
Component: engine
2017-06-07 06:20:27 -07:00
e930dafbb3
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 >
Upstream-commit: 0484bdb6ca0ddd0bebc490e335a7f788cdc30f13
Component: engine
2017-05-31 16:04:00 -07:00
5556f64d13
Vendor swarmkit 7e096ced
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 10df99f9ae48acc9888494223256637a8ca06f50
Component: engine
2017-05-23 15:01:35 -07:00
949950950a
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 >
Upstream-commit: aa6fc939baf0bae00391a0ba703187018055b8bf
Component: engine
2017-05-22 13:58:28 -07:00
f6ecbd87c6
Vendoring libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9b0e1df4dd2dbab6d2aacfaae0ea27deaf5c7c62
Component: engine
2017-05-18 15:14:12 -07:00
4f144ce76f
swarmkit vendoring
...
Signed-off-by: Abhinandan Prativadi <abhi@docker.com >
Upstream-commit: f3d8ff774e77c44f5b13474f74602ff772eb2f40
Component: engine
2017-05-17 18:46:34 -07:00
a66a7ebd10
Vendor swarmkit @998a47f
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 8daeeacfc1126eafb2b6d00e2dc6e2f5a6ed78cc
Component: engine
2017-05-17 15:50:28 -07:00
73e3c52c67
Vendoring libnetwork @b2bc1a6
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 46392f2442137ad52bb7382e91e7ad4b70d323b9
Component: engine
2017-05-17 15:50:28 -07:00
76789457c2
Use containerd Status variable when checking container state
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 0ea0b2becf119ca7950e8afcf5d440e800484b15
Component: engine
2017-05-15 10:53:51 -07:00
73273d4d5a
Update go-metrics to match swarmkit's dependency
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0a377b5f56181c59f68c21cf4c5507218f0109ac
Component: engine
2017-05-12 17:40:46 -07:00
7538411c99
Vendor swarmkit ae29cf2
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 721b7a7fadb7f43be4e9b1658ae76e6c91067dbf
Component: engine
2017-05-12 17:36:11 -07:00
1469dbf703
Libnetwork vendoring
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 385176980ef6c6f322c78d76bd2f98875e6aee69
Component: engine
2017-05-10 21:16:57 -07:00
6f58dd156b
Libnetwork vendoring
...
Fixes backward compatibility for memberlist
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 7ff9fb5f04e730b3de552746a800d7c1fcf06c48
Component: engine
2017-05-09 13:41:54 -07:00
600b71450c
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 >
Upstream-commit: 5122abeb4416c742255cb85d364d7d25d7f5ce32
Component: engine
2017-05-09 10:59:25 -04:00
cf964b3db2
Merge pull request #33059 from nishanttotla/vendor-swarmkit
...
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Upstream-commit: 4b846a125b1618e19b389bcdf88b57bef0a05817
Component: engine
2017-05-08 14:27:51 -07:00
53d1a4eb83
Merge pull request #33007 from crosbymichael/containerd-rc5
...
Update moby to containerd and runc 1.0 final rc
Upstream-commit: 7238cca42c3d024adfa030306ad3e3ec4232baed
Component: engine
2017-05-08 09:23:07 -07:00
4356b71651
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 1b68641fc8fe0767aba510ec04fdc1dd221e5d0c
Component: engine
2017-05-05 14:18:12 -07:00
ce61a3d4f2
Update moby to runc and oci 1.0 runtime final rc
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 005506d36c1c9308a05592d7596f3d484359c426
Component: engine
2017-05-05 13:45:45 -07:00
9f15ce38af
Merge pull request #29554 from cpuguy83/keep_running_count_of_states
...
Use counter for tracking container states
Upstream-commit: 669f4ba37ef6eb5419306e6af4f6efdce92501a0
Component: engine
2017-05-05 16:15:22 -04:00
f8ce0097a0
Vendor swarmkit 8f053c2
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 077f08bf54dc89d382cbcbd797b2bd7c4867151d
Component: engine
2017-05-02 15:51:26 -07:00
8fded72012
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 >
Upstream-commit: a28d91349edda7e4e4ecaa5b1e60a238fe515a4d
Component: engine
2017-05-02 11:23:36 +01:00
9fdc574804
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 >
Upstream-commit: e4c03623c2fcd3013343d246e3432409850c8c37
Component: engine
2017-04-29 17:10:14 -04:00
3f5d2b22f9
Libnetwork vendoring
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 44c3de84506d2346c2ea68e13b94e2e296aa4caf
Component: engine
2017-04-28 13:17:44 -07:00
648a386996
Libnetwork vendoring
...
Vendor libnetwork changes for --data-path-addr flag
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: b96988feb928d295569f82fd0eaed5c16efad41d
Component: engine
2017-04-26 15:33:13 -07:00
b369e3e6a2
Vendor swarmkit 61a92e8
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f2146cb74bec8741c8577db692b23ab77cc2d9b8
Component: engine
2017-04-14 10:20:58 -07:00
a8cbf4d0f4
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 >
Upstream-commit: e34bee387e0cba0da36b2c4b9113907933c32710
Component: engine
2017-04-12 16:55:47 -07:00
db16ab77b5
Vendoring Libnetwork library
...
- adding conntrack flush fix for docker/docker#8795
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: c16eb5f88a1ea3bef53b2bd7ea366397803c2af1
Component: engine
2017-04-10 17:52:16 -07:00
04adcf44c3
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
Upstream-commit: 2daa2b894c1cf62936fe55dc8782c486aafaecdd
Component: engine
2017-04-10 10:42:01 +02:00
f4a661bcfe
Merge pull request #32447 from aboch/vnd
...
Fix container no ipv6 when run container on --network=host
Upstream-commit: 9f27f0dcd3b8953a53f20e3f29f493d876b56941
Component: engine
2017-04-09 15:07:58 -07:00
974796cc86
Vendor swarmkit d5232280
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: ff068989303269fcd2912cac94adff12c6167ab5
Component: engine
2017-04-07 17:10:16 -07:00
66de9b1120
Vendoring libnetwork @ab8f7e6
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 60c36f88a5aaa051f111c96d0fb10fd6542f5f2e
Component: engine
2017-04-07 16:35:29 -07:00
593669c329
Merge pull request #32283 from aboch/clearingress
...
Daemon to take care of ingress cleanup on cluster leave and graceful shutdown
Upstream-commit: 87562af45bf32efce55d9fceb141a655b82a33c4
Component: engine
2017-04-07 20:09:27 +02:00
09386ff2b9
vendor docker/go-connections to include the enhacement for decrypting keys
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 7180f887ea4204a4a99f0de85ada64cac15856d7
Component: engine
2017-04-07 01:50:50 -04:00
7647ce4c36
Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 367b57d9859d2e3b4a651eb31d2d17f425329783
Component: engine
2017-04-05 18:49:23 -07:00
29ed9a4779
Vendoring libnetwork @f3c4ca8
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: bf5bebdfa0f7cc140f1c94d0e222aab714cbbcfb
Component: engine
2017-04-05 16:31:28 -07:00
214de28cc7
Vendoring swarmkit @b74ec2b
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 747f0b4ba52b25a4ede0d54cb1674f221ea3e2ed
Component: engine
2017-03-30 16:12:33 -07:00
9345697f56
vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: aac861f3d9d0a38d9bcc4e11d56ef9648bb1f79e
Component: engine
2017-03-28 11:51:33 -07:00
49cfd2488d
Vendor libnetwork @b6cb1ee
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ff049a4d4d6ab98d6a49631f29c346ab6086cb84
Component: engine
2017-03-24 11:07:33 -07:00
c2f1681e6f
Vendoring swarmkit @9fdea50
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 434e9695e42f9399c627d433972dbd73f7c8502f
Component: engine
2017-03-24 11:07:33 -07:00
392ffd1e6e
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)
Upstream-commit: afe1c5c2ebbe2d5448668761f722b0f5d2def9a5
Component: engine
2017-03-21 10:36:41 -07:00
95794e3edc
Merge pull request #31710 from sanimej/drillerrr
...
Add verbose flag to network inspect to show all services & tasks in swarm mode
Upstream-commit: cdf66ba715c573f85338a2b2a432db6cb9a48e6d
Component: engine
2017-03-13 21:12:32 -07:00
080e3bfe01
Update docker-credential-helpers to v0.5.0
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9dec486cf6d8e85bb5737b75e8520bb9433ec043
Component: engine
2017-03-13 21:08:41 +01:00
60e7990876
Vendor libnetwork for network inspect --verbose changes
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 67086764647b1c16553d1dd057f0e1d2c775c625
Component: engine
2017-03-12 21:23:21 -07:00
8d7175a239
Merge pull request #31743 from aaronlehmann/vendor-swarmkit-0e2d9eb
...
Vendor swarmkit 0e2d9eb
Upstream-commit: 43f8bce876c48d90fafd5fe9f9f223300bd06904
Component: engine
2017-03-10 16:33:15 -08:00
281516f8c3
Vendor swarmkit 0e2d9eb
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 79bf23845b7829bf68b9dda47af46886b274ac78
Component: engine
2017-03-10 11:15:44 -08:00
e65dda6e42
Merge pull request #31532 from aboch/vnd
...
Vendoring libnetwork @1a01921
Upstream-commit: 05e7f956bdf52a2a42c39d9d0b36169ec60b5b3a
Component: engine
2017-03-10 12:55:19 -05:00
d242c08875
Bump the version of go-connections
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 868f90a0dbcf9f898e035dc06290d8c91bb98155
Component: engine
2017-03-09 11:19:14 -08:00
e454be5cbf
Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503
...
Vendor swarmkit d60ccf3
Upstream-commit: 3fe2730ab3d7bba483d7bf4fb1e95b627823ff4d
Component: engine
2017-03-08 09:52:28 -08:00
