Commit graph

879 commits

Author SHA1 Message Date
Aaron Lehmann
bcbfaec7c6 Vendor swarmkit ae52d9d
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-28 18:35:29 -07:00
Drew Erny
fa4b810b41 Fix a rare segfault that can occur in service logs
Revendors swarmkit with a change that fixes a rare segfault that can
occur when following logs on a brand new service with bad bind mount
options.

Fixes docker/swarmkit#2147

Signed-off-by: Drew Erny <drew.erny@docker.com>
2017-04-28 11:43:00 -07:00
Aaron Lehmann
99ad8af0f2 [17.05] Vendor swarmkit 78db8a5
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-26 10:58:25 -07:00
Alessandro Boch
dbd2c592df [17.05.x] Vendoring libnetwork @5d4e5de
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-04-25 11:19:51 -07:00
Aaron Lehmann
2f24f3a90b Vendor swarmkit 78685cf
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-14 10:22:17 -07:00
Ying Li
b569b8674c 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:53:06 -07:00
Vincent Demeester
1a8206ca1f Merge pull request #32521 from mkumatag/update_shellwords
Vendor package update github.com/mattn/go-shellwords
2017-04-11 18:27:37 +02:00
Sebastiaan van Stijn
f30e94a495 Merge pull request #32505 from fcrisciani/conntrack_test
Conntrack flush support
2017-04-11 16:40:56 +02:00
Manjunath A Kumatagi
3d6d9061e3 Vendor package update github.com/mattn/go-shellwords
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
2017-04-11 18:14:00 +05:30
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
Flavio Crisciani
e88bc31afa
Vendoring Netlink library
- Added conntrack support

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-04-10 17:09:24 -07:00
Sebastiaan van Stijn
28334c1d82 Merge pull request #28403 from cpuguy83/logging_plugins
Implement plugins for logging drivers
2017-04-10 21:57:56 +02:00
Brian Goff
27bd6842f8 Implement plugins for logging drivers
Logging plugins use the same HTTP interface as other plugins for basic
command operations meanwhile actual logging operations are handled (on
Unix) via a fifo.

The plugin interface looks like so:

```go
type loggingPlugin interface {
  StartLogging(fifoPath string, loggingContext Context) error
  StopLogging(fifoPath)
```

This means a plugin must implement `LoggingDriver.StartLogging` and
`LoggingDriver.StopLogging` endpoints and be able to consume the passed
in fifo.

Logs are sent via stream encoder to the fifo encoded with protobuf.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-04-10 13:17:20 -04: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
Ian Campbell
b7ced33036 Revendor github.com/Nvveen/Gotty for github.com/Nvveen/Gotty#2
This fixes https://github.com/docker/docker/issues/32400

We were already actually vendoring from github.com/ijc25/Gotty in order to
pickup github.com/Nvveen/Gotty#1. github.com/ijc25/Gotty#master now contains
merges of both of those upstream PRs.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-04-06 12:19:32 +01: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
Sebastiaan van Stijn
2ce39de0c8 Merge pull request #32010 from dongluochen/swarmkit_vendor
vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
2017-03-30 17:24:33 +02:00
Alessandro Boch
694c787123 Vendoring vishvananda/netlink @c682914
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-29 10:58:02 -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
Madhu Venugopal
04295d26df Merge pull request #31714 from aboch/cingr
Allow user to replace ingress network
2017-03-27 07:30:42 -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
John Howard (VM)
4f7db6739d Revendor HCSShim @ v0.5.13
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-03-23 11:47:05 -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
David Gageot
97b572ea1b Windows: Fix Docker hanging with named pipes and stdin
Fixes #31922

Vendor a fork of Microsoft/go-winio that has this
PR (https://github.com/Microsoft/go-winio/pull/43)
merged


Signed-off-by: David Gageot <david@gageot.net>
2017-03-21 11:49:57 +01: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
Tibor Vass
43f8bce876 Merge pull request #31743 from aaronlehmann/vendor-swarmkit-0e2d9eb
Vendor swarmkit 0e2d9eb
2017-03-10 16:33:15 -08:00
Aaron Lehmann
79bf23845b Vendor swarmkit 0e2d9eb
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-10 11:15:44 -08:00
Brian Goff
05e7f956bd Merge pull request #31532 from aboch/vnd
Vendoring libnetwork @1a01921
2017-03-10 12:55:19 -05:00
Ying Li
868f90a0db Bump the version of go-connections
Signed-off-by: Ying Li <ying.li@docker.com>
2017-03-09 11:19:14 -08:00
Kenfe-Mickael Laventure
49131f3ad4 Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-08 14:56:29 -08:00
Tõnis Tiigi
3fe2730ab3 Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503
Vendor swarmkit d60ccf3
2017-03-08 09:52:28 -08:00
Sebastiaan van Stijn
7e031413f2 Merge pull request #31566 from AkihiroSuda/use-latest-vndr
rerun vndr
2017-03-08 12:16:50 +01:00
Aaron Lehmann
39433318fe Vendor swarmkit d60ccf3
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-03-07 19:09:21 -08:00
Akihiro Suda
5a1b06d7fd rerun vndr
* run latest vndr so as to collect more LICENSE files
 * remove unused packages
 * vendor github.com/philhofer/fwd with LICENSE.md (MIT)
 * vendor github.com/bsphere/le_go with LICENSE (MIT)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-08 02:29:34 +00:00
Justin Cormack
9067ef0e32 Seccomp Update
- Update libseccomp-golang to 0.9.0 release
- Update libseccomp to 2.3.2 release
- add preadv2 and pwritev2 syscalls to whitelist

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 22:19:46 +00:00
Alessandro Boch
b005c7d6eb Vendoring libnetwork @1a01921
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-03-03 15:55:06 -08:00
Kenfe-Mickaël Laventure
d8b0d2b9e9 Merge pull request #30729 from dmcgowan/update-go-connections
Update go-connections package
2017-03-01 18:24:32 -08:00
Vincent Demeester
c956d25bfc Merge pull request #31393 from aaronlehmann/vendor-swarmkit-46bbd41
Vendor swarmkit 46bbd41
2017-02-28 09:40:20 +01:00
Aaron Lehmann
99119fcafa Vendor swarmkit 46bbd41
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-27 11:51:00 -08:00
Alessandro Boch
ff6a3bef5a Vendoring libnetwork @bdc9dce
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-24 11:08:53 -08:00