Commit Graph

437 Commits

Author SHA1 Message Date
b6bdcc10a5 Merge pull request #37485 from fcrisciani/resolv
Systemd-resolved proper handling
Upstream-commit: e1584514c15f6ad91b9ef5bc530a1eef46f18267
Component: engine
2018-08-01 14:52:33 +02:00
14dcb25448 Bump a bunch of dependencies to more recent versions
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0d108aa6ba4a52db1dd2bba0fd512903ab725ca
Component: engine
2018-08-01 10:37:27 +02:00
0f058dae99 Bump mergo to v0.3.6
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a550b0ae475ebbfcffe92d9bf40734f5b3de2f7e
Component: engine
2018-07-31 10:03:43 +02:00
c3d8713381 Merge pull request #37514 from jterry75/linux_metadata
Adds LinuxMetadata support by default on Windows
Upstream-commit: 13a8031e1c8593e820f20edc713c89dbe65cee3b
Component: engine
2018-07-27 17:51:10 +01:00
d481c9e35d Vendor libnetwork
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: fc4ebe0b8bc5e41b3b2d108c21dc19ea08a9fcb7
Component: engine
2018-07-26 11:17:56 -07:00
1fb6cc9e1e Add a way to get a pid of a process
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 0fc52ca6dd628f2b9163f5d328d1d749c6708de4
Component: engine
2018-07-26 11:17:46 -07:00
7307ff9185 Merge pull request #37515 from Microsoft/jjh/revendoropengcs
Revendor Microsoft/opengcs @ v0.3.8
Upstream-commit: 6f8d85c441be3943eaa82d01430b39b90261d20c
Component: engine
2018-07-25 23:41:10 +02:00
fd8de2c620 Revendor Microsoft/opengcs @ v0.3.8
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
Upstream-commit: 25aaf9772bbef81ee6557d23f37ac69f988d1050
Component: engine
2018-07-23 10:45:24 -07:00
4ac052187e Adds LinuxMetadata support by default on Windows
1. Sets the LinuxMetadata flag by default on Windows LCOW v1
MappedDirectories.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
Upstream-commit: e93077bcdf77be2e7e3aec9f9686dace9e18c850
Component: engine
2018-07-23 09:59:35 -07:00
2a78eeac5b vendor: bump google/certificate-transparency-go to 1.0.20
This is to include the Windows + Go1.11 fix
(https://github.com/google/certificate-transparency-go/issues/284).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: dacefc32b27816c26caeba713b88f6767d2486d7
Component: engine
2018-07-19 10:47:53 +03:00
e9484ed940 Merge pull request #37484 from thaJeztah/bump_swarmkit
Update swarmkit to 68266392a176434d282760d2d6d0ab4c68edcae6
Upstream-commit: 25ec60d3cdc14a444f54b741a65ef5ef199844a2
Component: engine
2018-07-17 15:12:00 -07:00
1244bbdf28 Merge pull request #37439 from tiborvass/vendor-buildkit
Set BuildKit's ExportedProduct variable to show useful errors in the future
Upstream-commit: 9ebed53c5431a7c8296107869f1b3feabee9e8f3
Component: engine
2018-07-17 12:10:23 -07:00
6bdc6fed4e Update swarmkit to 68266392a176434d282760d2d6d0ab4c68edcae6
changes included:

- swarmkit #2706 address unassigned task leak when service is removed
- swarmkit #2676 Fix racy batching on the dispatcher
- swarmkit #2693 Fix linting issues revealed by Go 1.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c9377f45529d5dce21c264947b73c7053f316467
Component: engine
2018-07-17 20:55:07 +02:00
adc3470981 vendor: buildkit to 98f1604134f945d48538ffca0e18662337b4a850
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0ab7c1c5bacdf8b18c66b729bb7f919f6acfcf29
Component: engine
2018-07-16 21:41:53 +00:00
1efda2126e vendor: update continuity to 0377f7d767206
This is to include the Go 1.11 fix
(https://github.com/containerd/continuity/pull/120).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: c64a2448d1f2b7ba680dcb017cd46dcb8ac359c4
Component: engine
2018-07-12 16:38:05 -07:00
d3875eff05 Bump libnetwork to d00ceed44cc447c77f25cdf5d59e83163bdcb4c9
The absence of the file /proc/sys/net/ipv6/conf/all/disable_ipv6
doesn't appear to affect functionality, at least at this time.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d58c4cbe6c781c78db352db2956e9949b8fc8609
Component: engine
2018-07-09 21:03:50 +02:00
730b7c1410 Merge pull request #37372 from ctelfer/scalable-lb
Improve scalability of the Linux load balancing
Upstream-commit: 328c089b5bca66594c4937e88cf9879879c4eed7
Component: engine
2018-07-09 20:06:37 +02:00
68bf9d2bfa Merge pull request #37390 from thaJeztah/update_cfssl_for_swarmkit
Update cloudflare/cfssl to 1.3.2
Upstream-commit: c8bda42d1632163c62f6a3d32969af2ba5463ab3
Component: engine
2018-07-09 09:10:25 +02:00
af3a05526e Merge pull request #37411 from tonistiigi/vendor-containerd
vendor: update containerd to b41633746
Upstream-commit: ae1160b8d8dd0b877bb58226852422c63b7210ce
Component: engine
2018-07-06 18:37:31 -07:00
3c2cc200c2 vendor: update containerd to b41633746
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f0e61582664d16c5a608c3a742cc12b6b006bca6
Component: engine
2018-07-06 14:43:49 -07:00
dcf345fe9b Bump libnetwork to 3ac297bc
Bump libnetwork to 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b in order to
get fix 0c3d9f00 which addresses a flaw that the scalable load balancing
code revealed.  Attempting to print sandbox IDs where the sandbox name
was too short results in a goroutine panic.  This can occur with
sandboxes with names of 1 or 2 characters in the previous code. But due
to naming updates in the scalable load balancing code, it could now
occur for networks whose name was 3 characters and at least one of the
integration tests employed such networks (named 'foo', 'bar' and 'baz').

This update also brings in several changes as well:
 * 6c7c6017 - Fix error handling about bridgeSetup
 * 5ed38221 - Optimize networkDB queue
 * cfa9afdb - ndots: produce error on negative numbers
 * 5586e226 - improve error message for invalid ndots number
 * 449672e5 - Allows to set generic knobs on the Sandbox
 * 6b4c4af7 - do not ignore user-provided "ndots:0" option
 * 843a0e42 - Adjust corner case for reconnect logic

Signed-off-by: Chris Telfer <ctelfer@docker.com>
Upstream-commit: 0e162d992394d9216f590176991d33ff48ef3389
Component: engine
2018-07-06 13:58:09 -04:00
be1844eeef Bump swarmkit to include task reaper fixes and more metrics.
This includes the following behavior-modifying PRs:

- docker/swarmkit#2673
- docker/swarmkit#2669
- docker/swarmkit#2675
- docker/swarmkit#2664

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: b322705750cddef903a1097e65a46a6a86610d0a
Component: engine
2018-07-05 15:24:10 -07:00
472b9e9903 Update cloudflare/cfssl to 1.3.2
Matching the version that is used in SwarmKit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7084487fdcfaf0fdb76a98757d49033c817c5978
Component: engine
2018-07-04 17:47:22 +02:00
086353aeec update fsnotify to v1.4.7
Fixes a possible deadlock on closing the watcher on kqueue

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9f016c0fe1cd30381805fdb225854a36a806e961
Component: engine
2018-07-04 16:58:25 +02:00
acd7279a5e vendor: update buildkit to 9acf51e491
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6144f50e553cf268a4d27cbe774a67b6ab283423
Component: engine
2018-07-03 15:22:39 -07:00
fddf778dd0 bump libnetwork to b0186632
Bump libnetwork to b0186632522c68f4e1222c4f6d7dbe518882024f.   This
includes the following changes:
 * Dockerize protocol buffer generation and update (78d9390a..e12dd44c)
 * Use new plugin interfaces provided by plugin pkg (be94e134)
 * Improve linux load-balancing scalability (5111c24e..366b9110)

Signed-off-by: Chris Telfer <ctelfer@docker.com>
Upstream-commit: 92335eaef12fb0fb86e5e7503f88b8873a9fa973
Component: engine
2018-07-03 13:46:19 -04:00
51cfb2a768 bump libnetwork to 430c00a
Bump libnetwork to 430c00a6a6b3dfdd774f21e1abd4ad6b0216c629.  This
includes the following moby-affecting changes:

 * Update vendoring for go-sockaddr (8df9f31a)
 * Fix inconsistent subnet allocation by preventing allocation of
   overlapping subnets (8579c5d2)
 * Handle IPv6 literals correctly in port bindings (474fcaf4)
 * Update vendoring for miekg/dns (8f307ac8)
 * Avoid subnet reallocation until required (9756ff7ed)
 * Bump libnetwork build to use go version 1.10.2 (603d2c1a)
 * Unwrap error type returned by PluginGetter (aacec8e1)
 * Update vendored components to match moby (d768021dd)
 * Add retry field to cluster-peers probe (dbbd06a7)
 * Fix net driver response loss on createEndpoint (1ab6e506)
   (fixes https://github.com/docker/for-linux/issues/348)

Signed-off-by: Chris Telfer <ctelfer@docker.com>
Upstream-commit: f155f828a26cfb3ee0dd8ca48bd2c702c9032b0b
Component: engine
2018-06-29 11:03:20 -04:00
f83b2543cd Update Microsoft/go-winio to 0.4.8
Fixes named pipe support for hyper-v isolated containers

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 74095588baa0693a2c07bd05c001c42830f82ed3
Component: engine
2018-06-28 18:55:45 +02:00
b30a6b365b Merge pull request #37350 from tonistiigi/platform-support
Fix platform struct passing
Upstream-commit: 1436dc8f8d0f6f60b6e335fbd918d6b22ee6574d
Component: engine
2018-06-27 19:23:27 -07:00
86aefcafc8 vendor: update containerd to 08f7ee98
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d66615be94d548c1d102006a477c3abbaff93274
Component: engine
2018-06-27 11:59:10 -07:00
ebe6026bac vendor: update buildkit to cce2080ddb
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 360d2f2ce7cba28fc5427bc346ea37aee7fe78f6
Component: engine
2018-06-26 22:58:59 -07:00
4abb04c090 Fix compilation on 32 bit systems
* Update runc commit to ad0f525
* Update buildkit to dbf67a6

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c5ce4cf654b6cd6402957bd7c7570dd4fac1b902
Component: engine
2018-06-15 20:41:03 +00:00
9b920fd3e1 Replace gotestyourself by gotest.tools
github.com/gotestyourself/gotestyourself moved to gotest.tools with
version 2.0.0. Moving to that one, bumping it to v2.1.0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c147e9e1a45b1c66bc5773814b53bcd27132557c
Component: engine
2018-06-13 09:04:03 +02:00
e027a9c59e Merge pull request #37151 from tonistiigi/experimental-buildkit
Experimental BuildKit support
Upstream-commit: c752b0991e31ba9869ab6a0661af57e9423874fb
Component: engine
2018-06-12 13:31:48 -07:00
36f219fce9 Upgrade imdario/mergo to v0.3.5
Mainly to get inline with `docker/cli` version of that dependency

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f929f15dd6e316402394143eeb60ad9ba95a81cb
Component: engine
2018-06-11 15:30:46 +02:00
5dc3589aac Merge pull request #37252 from thaJeztah/bump-libnetwork
bump libnetwork to 19279f0492417475b6bfbd0aa529f73e8f178fb5
Upstream-commit: d812dee47e26ad4db1d53102f0c16af01f70cf2c
Component: engine
2018-06-11 08:23:05 +02:00
90ea116cca vendor: update runc for helper packages
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2092adf3098f4d1b59ced05251a503f930b84805
Component: engine
2018-06-10 10:05:31 -07:00
1abaf0d46a vendor: add buildkit dependency
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6fcb36ff140f03574df7164e8dda10a20886a4b1
Component: engine
2018-06-10 10:05:19 -07:00
9caba3315b bump libnetwork to 19279f0492417475b6bfbd0aa529f73e8f178fb5
includes;

- docker/libnetwork#2178 Fix possible race on ingress programming
- docker/libnetwork#2180 Fix spurious deadlock in overlay driver

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6630f214fae3bc7c8b802a0b58e1bacd9adc6148
Component: engine
2018-06-08 20:34:29 -07:00
9a81ad55fc vendor: update containerd to 63522d9
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 44f3dd7653a1c5739d2c25d1227d945d9c686c86
Component: engine
2018-06-08 19:19:06 -07:00
bf25aa33ff Merge pull request #37209 from thaJeztah/bump_libnetwork
bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
Upstream-commit: 21291e5aefe1f13f3208d57bcc4183848c492bd1
Component: engine
2018-06-06 13:41:33 -07:00
5028541e5c Merge pull request #37192 from thaJeztah/update_miekd_dns
Update miekg/dns to v1.0.7
Upstream-commit: 9b0b9a0ece532caa806594b5fbc5eef2d6777b10
Component: engine
2018-06-06 11:24:54 -07:00
4cdb057509 bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fe02b187555b25cb1a92ecaaac2b8b9f5b6a293d
Component: engine
2018-06-05 11:29:23 -07:00
60c800804e Update containerd to 1.1
Updates swarmkit, grpc, and all related vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 52ed3e0896c203013388a3eb603658f345a9d80a
Component: engine
2018-06-04 15:37:03 -07:00
f01f23683f vendor: add new opentracing deps for session tracing
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ad77dee8baafc478baa18f65a4972ba19b6e973f
Component: engine
2018-06-02 11:10:38 -07:00
2f23577c7a vendor: use dockerfile parser from buildkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c9ebd2f13b3aab49c2d90cc38dcf2cd0d059697f
Component: engine
2018-06-02 11:10:34 -07:00
9d9413af9f Update miekg/dns to v1.0.7
This dependency now uses SemVer, tagged releases.
Also updates dependencies

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4acddf21b7c11c2c6a71f0f9ba1d329cfbb99e5f
Component: engine
2018-06-01 16:24:59 +02:00
8c68c67c26 Merge pull request #37136 from muesli/sdnotify-api-const
Use go-systemd const instead of magic string in Linux version of dockerd
Upstream-commit: 80bfcc3a7a870c5b3683489ebc6fec9d67a3dfc4
Component: engine
2018-05-24 14:30:28 +02:00
93d19d1ff6 Bump go-systemd dependency to v17
Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com>
Upstream-commit: 8991bac2e045b8cac4a289928ebb743e978bbfc5
Component: engine
2018-05-23 19:06:13 +02:00
7a450d43c0 Bump continuity
Fixes an issue where `CopyDir` would truncate files larger than 2^32
bytes.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 616fa9446e49502da501a7d0f92b13191f5058dd
Component: engine
2018-05-23 10:05:06 -04:00