0051caf8c8
vendor: update deps for fssession
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7cfcf74a907bb1fce63e95761c7e1ac70cb9e5df
Component: engine
2017-06-22 11:22:42 -07:00
0ae69f3fe0
Merge pull request #33750 from dnephin/cleanup-more-cli-leftovers
...
Cleanup more cli leftovers
Upstream-commit: 4bdb6ed9b58d641176a601cfe92d496038c5a557
Component: engine
2017-06-21 21:23:28 -07:00
e9c808203d
Remove miekg/pkcs11 from vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4e5293c253c4803de75c77cc9cee024d95303d6a
Component: engine
2017-06-21 11:18:44 -04:00
3ad2759bd3
Vendor jhowardmsft/opengcs v0.0.3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 07034a4420c9bd1cb964f18c0128a215ab17d5a8
Component: engine
2017-06-20 19:49:56 -07:00
1a43aff22a
Vendor Microsoft/hcsshim @ v0.5.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8fe9eb0551aa02eeacf1a27d5cf5adeb0c2bacac
Component: engine
2017-06-20 19:49:55 -07:00
7d5222b592
vendor: remove unused package
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 932759c288ef3055919388bc0319cddde0bee34a
Component: engine
2017-06-15 13:23:11 -07:00
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
6eb59ca44c
Update grpc to v1.3.0 and bump protobuf bindings.
...
and update some dependent packages.
We would like to keep moby/moby and swarmkit somewhat in sync here and
https://github.com/docker/swarmkit/pull/2229 proposes a similar bump to
swarmkit, needed due to https://github.com/docker/swarmkit/pull/1965 which
pulls in containerd which uses some newer features of the grpc package.
Signed-off-by: Ian Campbell <ian.campbell@docker.com >
Upstream-commit: 379557a95873aad26b7eb20a7a48f8e1e7551041
Component: engine
2017-06-08 14:34:23 +01: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
9b30256194
Merge pull request #33360 from aaronlehmann/vendor-swarmkit-7e096ced
...
Vendor swarmkit 7e096ced
Upstream-commit: 6629f1d0e753edc960f30030299e0e5d48b845aa
Component: engine
2017-05-30 09:59:48 -07:00
05027a4b96
Update go-winio to v0.4.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 3f13107223a9753d709c196c46f1c846041fc0c3
Component: engine
2017-05-23 18:27:50 -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
7813ee64ef
Merge pull request #33310 from darrenstahlmsft/RevendorGowinio
...
Revendor go-winio to v0.4.1
Upstream-commit: 65f360fc415a5ef648250a76ca261c2ae529467a
Component: engine
2017-05-22 10:31:57 -07:00
bce5af578c
Revendor go-winio to v0.4.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: af7d8d09ef2dde07c9c0004a14e3a28c93007458
Component: engine
2017-05-19 16:13:52 -07:00
1f14cbbc58
Revendor runtime-spec
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: b90f294c1cf0dd2bc3f139cd8f339da79595a0bb
Component: engine
2017-05-19 12:33:14 -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
a5f77dbdd1
Vendor gogoprotobuf v0.4
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 3950cef94111ccd7d15091059e562960554900fc
Component: engine
2017-05-17 15:50:28 -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
f81cca9824
Merge pull request #33075 from x1022as/stop
...
fix inconsistent state string with containerd
Upstream-commit: 4dd3e5b77c2f5ab8203cb8fc239e8441a504d799
Component: engine
2017-05-17 09:27:47 -04:00
a57be1e4d4
api: Use OCI types for Digest and Platform
...
The current use of the types from distribution brings in some
unfortunate dependencies, including other distribution packages and the
gorilla/mux and gorilla/context packages. Using the OCI types avoids
the extra dependencies for client users.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 309f99edae5849327ab9c3ec9335b42ba5612202
Component: engine
2017-05-16 14:54:23 -07:00
e9a2524de1
Add missing go-difflib vendoring
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 8c340b7edfa042d67ad766152ae61ef03e54793d
Component: engine
2017-05-15 11:23:52 -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
c8c0bf9d2e
Merge pull request #33100 from fcrisciani/memberlist_version
...
Libnetwork vendoring
Upstream-commit: 2ca41c47c4a0e430267f960836ab182964557fdb
Component: engine
2017-05-10 21:09:38 -07:00
d781af028f
Update go-winio to v0.4.0
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 24d41778595722d2d318eba45d9e723aaa918b20
Component: engine
2017-05-09 17:49:55 -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
cce43bed79
Revendor Microsoft\hcsshim @ v0.5.17
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1bb3f57c45274e48f675a4548adc030deedda74c
Component: engine
2017-05-09 11:44:14 -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
79f9dd11cc
Merge pull request #32687 from runcom/oci-selinux
...
Switch to using opencontainers/selinux for selinux bindings
Upstream-commit: 4219156a6254bdc7d270f06742037df8e2708a9a
Component: engine
2017-04-29 19:05:32 +02:00
cede85c141
Merge pull request #32902 from fcrisciani/memberlist_bump
...
Vendoring memberlist tag 0.1.0
Upstream-commit: 30221cc521234e6f160be3d3f9680abdcd59beab
Component: engine
2017-04-28 18:42:21 -07: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
93768aaea3
Vendoring memberlist tag 0.1.0
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 01fd4e49c3cadcca435289279bd600ee6403d67c
Component: engine
2017-04-27 13:21:35 -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
9432bd8249
Switch to using opencontainers/selinux for selinux bindings
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: abbbf914986d6d0ea15923f9a57a99465791bc83
Component: engine
2017-04-24 21:29:47 +02:00
7a295107af
Merge pull request #32626 from aaronlehmann/vendor-swarmkit-61a92e8
...
Vendor swarmkit 61a92e8
Upstream-commit: cd4c089b9e026317ea85e816b1323cf6465b662b
Component: engine
2017-04-17 23:24:43 -05:00
