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

22 commits

Author SHA1 Message Date
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
Flavio Crisciani
6716626d32 Merge pull request #2172 from thaJeztah/update_miekd_dns
Update miekg/dns to v1.0.7
2018-06-20 14:31:49 -07:00
Flavio Crisciani
59a2ef7843 Merge pull request #2128 from fcrisciani/go-sockaddr-vndr
Vendor go-sockaddr
2018-06-18 11:37:12 -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
Kir Kolyshkin
a6ec9e673b Bump golang.org/x/net
This version includes "x/net/context" which is fully compatible with
the standard Go "context" package, so the two can be mixed together.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-04-24 14:40:29 -07:00
Flavio Crisciani
74d7da907a Vendor go-sockaddr
diff:
acd314c578...6d291a969b

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-03-27 09:14:06 -07:00
Sebastiaan van Stijn
a360943a48 Fix golang.org/x/sync canonical import path
The golang.org/x/sync package was vendored using the
github.com/golang/sync URL, but this is not the canonical
URL.

Because of this, vendoring failed in Moby, as it detects
these to be a duplicate import:

    vndr github.com/golang/sync
    2018/03/14 11:54:37 Collecting initial packages
    2018/03/14 11:55:00 Download dependencies
    2018/03/14 11:55:00 Failed to parse config: invalid config format: // FIXME this should be golang.org/x/sync, which is already vendored above

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-03-14 13:11:08 +01:00
Flavio Crisciani
b8c14de74a Vendor golang/sync
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-03-09 11:07:28 -08:00
Sebastiaan van Stijn
ba5b3ee8d9 Bump BurntSushi/toml for MIT License
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-16 13:17:40 +01:00
Wataru Ishida
2120ed2363 Support SCTP port mapping
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-13 16:01:03 +09:00
Flavio Crisciani
5f773281d2 Revendor memberlist
diff: https://github.com/hashicorp/memberlist/compare/v0.1.0...master

Relevant changes:
 - Calculates the timeout for dial using the deadline
 - Reduce LAN min suspicion multiplier
 - fix deadlock in shutdown process of memberlist

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2018-01-23 14:22:09 -08:00
Flavio Crisciani
5b89af1bba Vendor latest netlink library
- needed the methods to set the proper timeout

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-12-04 09:40:38 -08:00
Sebastiaan van Stijn
f864421ead bump docker/docker to master and unfork dependencies
This patch updates all dependencies to match what is
used in moby/moby. Making the dependencies match
what is used in that repository makes sure we test
with the same version as libnetwork is later built
with in moby.

This also gets rid of some temporary forks that were
needed during the migration of Sirupsen/logrus to
sirupsen/logrus.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-25 17:26:25 +02:00
Pradip Dhara
cc08cacfab Vendoring microsoft/hcsshim v0.6.3
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
2017-08-29 22:44:33 -07:00
Derek McGowan
710e0664c4 Update logrus to v1.0.1
Fix case sensitivity issue
Update docker and runc vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-07 11:20:47 -07:00
Flavio Crisciani
acf9c53292 Vendoring netlink library
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-06-06 09:24:22 -07:00
Flavio Crisciani
34ce7c7e6a Revert "Move Cluster provider back to Moby"
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-05-25 10:47:02 -07:00
Flavio Crisciani
e777305c7f Moby vendoring
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-05-24 11:46:36 -07:00
Flavio Crisciani
541cafdb30 Vendoring memberlist tag 0.1.0
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-04-27 13:32:34 -07:00
Flavio Crisciani
6f062c298a Vendoring the netlink changes
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-04-07 15:12:22 -07:00
Brian Goff
a143df7d99 revendor x/net and gogo/protobuf to match docker/docker
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-03-21 15:47:05 -04:00
Santhosh Manohar
bfd1683e74 Use vndr for managing libnetwork dependencies
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2017-01-11 17:22:05 -08:00