dee80812af
Merge pull request #26354 from KingEmet/fixbranch
...
make GetAll use client.List as the source of truth
Upstream-commit: 67b85f9d26f1b0b2b240f2d794748fac0f45243c
Component: engine
2016-10-24 14:25:24 -07:00
661452cc19
Merge pull request #27405 from tonistiigi/fix-fifo2
...
Fix issues with fifos blocking on open
Upstream-commit: 32b541e44385206772b30b2a6f241a7c809aa62f
Component: engine
2016-10-21 09:44:33 -07:00
5e6ef3def9
revendor go-units to update more accurate time display
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 3cff9e0267780427b74f1b106798d9bb3c112eb2
Component: engine
2016-10-21 11:05:11 +08:00
5c4198ba60
Fix issues with fifos blocking on open
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6d26464502b4e8ecfd8f5605196605624fb79944
Component: engine
2016-10-20 17:02:02 -07:00
0ce7aa426e
Vendor swarmkit in master
...
Also, update libnetwork and grpc.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 12a4ed03178982fec44b75479c3e63a316503d90
Component: engine
2016-10-20 13:49:22 -07:00
56af301200
Merge pull request #27287 from mavenugo/pluginv2-sk2
...
Allow multiple handlers to support network plugins in swarm-mode
Upstream-commit: 2c620d0aa24c5f774a9115449a86b158b005bba8
Component: engine
2016-10-20 13:43:04 -07:00
dd35c23542
record pid of exec'd process
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 18083481361a4053d1081a201120a916239fc0ed
Component: engine
2016-10-20 17:06:11 +02:00
5d48ce28d0
Merge pull request #26983 from aaronlehmann/logrus-wrapped-errors
...
Fix problems with wrapped errors in logrus
Upstream-commit: 9f30c28d2176b2822b7e66e4b0f462bb6a2cbe36
Component: engine
2016-10-19 10:16:01 -07:00
f7298ec9d2
Update sfp13/pflag
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4e4da146ecc726f9fb78553710e019edb4685d18
Component: engine
2016-10-18 17:17:22 -07:00
9fcbef44d7
Fix problems with wrapped errors in logrus
...
This vendors a fork of logrus with fixes to deal with errors generated
by the github.com/pkg/errors package. Without these fixes, the errors
are mishandled when passed to WithError:
- When printing to a terminal (colors enabled), stack traces are
included in the error fields on a log line.
- When printing to a file (or with colors disabled), the error value is
missing entirely.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 738131faae42760957abdaa5a64648ed481eee71
Component: engine
2016-10-18 17:14:59 -07:00
136f5c6e75
Merge pull request #27474 from tagomoris/identify-fluentd-driver-stops-after-restarts
...
Update fluent-logger-golang to v1.2.1
Upstream-commit: 329f272fd55c9c9c335eef354ab4ec7b09a5c727
Component: engine
2016-10-18 12:47:13 -07:00
f3b85d76fb
Merge pull request #27471 from caarlos0/logentries
...
Added Logentries Driver
Upstream-commit: 24582e815330edd197337f17b1a0a541679f969b
Component: engine
2016-10-18 01:33:28 -07:00
7a03f51c60
Update fluent-logger-golang to v1.2.1
...
This fixes a regression bug not to connect the destination node twice or more.
That regression was brought by v1.2.0, and it also makes many goroutines for
first reconnection (these will finish after first reconnection established).
Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com >
Upstream-commit: 53ed17449e990f49e8eecdf71ec3704ce7118660
Component: engine
2016-10-18 11:26:32 +09:00
23d87cfd7e
Added logentries dependency to vendor
...
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com >
Upstream-commit: 0f4db1cc59faddb0207db269fd660e8e1582b77a
Component: engine
2016-10-17 22:06:39 -02:00
b3348bdb01
Vendoring Swarmkit 1fed8d2a2ccd2a9b6d6fb864d4ad3461fc6dc3eb
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 88cae7412dfcf30e94e09c5a057e887bdb84d618
Component: engine
2016-10-15 08:49:55 -07:00
58bc04a76a
Bump vendored and dockerfile notary version to v0.4.2
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: 5f4dcd825299bf58e87e69c2bff3ceefc300a432
Component: engine
2016-10-14 17:52:56 -07:00
f54a7d0f94
Vendoring libnetwork @04025f2a2eebb
...
Fixes #27323
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 9ae9f9812bc078523d64625793c079d99215cb63
Component: engine
2016-10-14 11:12:24 -07:00
a97d7743a8
Vendor libnetwork.
...
This is primarily for plugingetter import path change.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 1845f506e4dad6916fd10564e2c8b0b18f43a7c9
Component: engine
2016-10-11 13:09:01 -07:00
9dfec63192
Merge pull request #26954 from mrjana/net
...
Vendoring libnetwork @7b74403
Upstream-commit: 5ff17cb4aae435715733c169fce21a3677cd21a7
Component: engine
2016-10-11 05:59:35 -07:00
70c250faf0
Windows: Update go-winio to 0.3.5
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 97ac469934051c5275d5130287d4a8eece84a412
Component: engine
2016-10-10 15:08:17 -07:00
21e065470e
Vendoring libnetwork @7b74403be424
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 83ba14a55229c4e52293ef0877cadb2b83bb7f0b
Component: engine
2016-10-10 14:39:02 -07:00
9ad2ffa17a
Merge pull request #27160 from mlaventure/update-containerd
...
Update containerd and runc
Upstream-commit: 5ee2c2a6475056f55327ce77b61677499a9e3fa8
Component: engine
2016-10-06 19:36:31 +02:00
6e5d016ba6
Update containerd and runc
...
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7e12c3bb99381f117be73e05c187be6ce44280b9
Component: engine
2016-10-05 14:47:15 -07:00
02536572fb
Revendor hcsshim to v0.5.1
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 267c04aa36a54260242a2cffbd19d4f25f782e94
Component: engine
2016-10-05 14:40:51 -07:00
3a03b98841
Merge pull request #26932 from dmcgowan/update-tar-split
...
Update tar split
Upstream-commit: 921a0bf686370587aec812a3a0efb002adf07614
Component: engine
2016-10-05 13:45:07 -07:00
c735d7ed2f
Merge pull request #27038 from jstarks/non_base_utilityvm
...
Windows: support Windows servicing layers
Upstream-commit: 214b70e6ef9c5430c48cd88303f4cc0574e0037a
Component: engine
2016-10-05 10:02:31 -07:00
750c4cf157
Windows: Revendor hcsshim v0.4.5
...
This update adds support for non-base layers that have utility VM updates
and hard links. This is necessary to support Microsoft-released layers
with servicing updates.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: cab70c391f465905de2e2c5bd844c181c3c9a01b
Component: engine
2016-10-03 11:00:04 -07:00
a56e5f9c6c
Vendor docker/swarmkit changes.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 009f74135123c785783349358d5ad69aa0992305
Component: engine
2016-10-03 10:59:38 -07:00
3b8c0feef0
Vendor in docker/libnetwork.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 2b0f0d0d711cf64233d984a02287c2167ce2d6c3
Component: engine
2016-10-03 10:40:05 -07:00
f44fc82a36
Merge pull request #26961 from Microsoft/jjh/oci
...
Windows: OCI runtime spec compliance
Upstream-commit: 97660c6ec55f45416cb2b2d4c116267864b62b65
Component: engine
2016-09-30 10:13:57 -07:00
2028ec4919
Revendor OCI runtime-spec 1c7c27d043c2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ba2df174935b5119f336e7f3ab5228cd41279791
Component: engine
2016-09-27 12:05:47 -07:00
ba7b4eb489
Update tar split
...
Pulls in fix for tar split disassembly incorrectly storing the padding
at the end of the file, leading to a hash difference on the
re-assembled tar archive.
Closes #26434
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: e3382177703989e6c29b1e5d8d3d800e033a617a
Component: engine
2016-09-27 09:57:56 -07:00
ada47b1174
Revendor swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
...
This commit updates swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 8f4afb86eeb7f3f4a26eec51e4b843e1714f9f46
Component: engine
2016-09-26 23:48:16 -07:00
c7b9575ce1
Revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
...
This commit revendor swarmkit to 7b202f058db2f3a7d41351a56e5ef720c9b5a45d
to improve error message for removing pre-defined (e.g., `ingress`) network.
This commit is related to 24538.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f4e94617f087fc19614858fe496314673ad3877d
Component: engine
2016-09-24 12:14:04 -07:00
9b9def0b18
Vendoring libnetwork @bf3d9ccfb8e
...
Fixes certain node management issues when a daemon is restarted or fails
or leaves and joins a swarm.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: cd20621201d48f76b856d7d2404ee182e41e3492
Component: engine
2016-09-23 16:06:38 -07:00
96fcc41e48
make GetAll use client.List as the source of truth
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: b264632904ce795e0991a17d803e192f7248bee3
Component: engine
2016-09-23 11:48:15 -07:00
1778a3ba1e
Vendoring libnetwork @6caf9022fa09
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 746113d5840d064843a3d0b4c2cd68459b1d9415
Component: engine
2016-09-22 21:00:32 -07:00
956358039b
Vendoring dependencies
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: 522930cfb3a9786d6c730e92068ea5b2656cabb0
Component: engine
2016-09-22 12:21:28 -07:00
7c1d86c305
Removed engine-api leftovers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 45818d6fc49e6da0369a33f015967fff7417df1c
Component: engine
2016-09-21 12:36:52 +02:00
fe82ab0481
Merge pull request #26538 from LK4D4/update_grpc
...
Update grpc to v1.0.1-GA
Upstream-commit: 758a809f5453355c6d118271db971d90248652f5
Component: engine
2016-09-20 23:19:26 +02:00
53ebd11aff
vendor: update containerd and swarmkit
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: eeceb0ccc8318ecbf577147363666b959959450e
Component: engine
2016-09-20 09:24:36 -07:00
19f0411692
Update fluent-logger-golang to v1.2.0.
...
Fix race condition issue to solve an issue about "panic: runtime error: invalid memory address or nil pointer dereference".
This fix stabilize Docker daemon under the situation of communication problem with Fluentd processes.
Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com >
Upstream-commit: 87124b9d62bc71f7632126cf7f8d5eb805c4a7f1
Component: engine
2016-09-20 20:31:22 +09:00
fe6c7fd94a
re-vendor syslog package
...
Fixes #26394
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f528690674712b680caf2712092c7e2f8f236491
Component: engine
2016-09-17 10:25:05 -04:00
17ba48af4f
Merge pull request #26583 from aboch/vnd
...
Vendoring libnetwork @c8ce8c7
Upstream-commit: 4adbd5338d8f76e1a0895583f580993221451b08
Component: engine
2016-09-15 20:28:07 -07:00
8e66a0ffda
vendor: update grpc and protobuf
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: afe23cea3d73fc4c5f90ff109edbddd339ea29ed
Component: engine
2016-09-15 11:36:31 -07:00
a320cdf50c
Vendoring boltdb @fff57c100
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5cfbdceafe87df8bab85c0561a1483d3191eb775
Component: engine
2016-09-15 10:53:48 -07:00
30accdf3a6
Vendoring libnetwork @c8ce8c7
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 161c12142594d602ed46ef7601a57e3761d52f99
Component: engine
2016-09-14 14:46:05 -07:00
99577ad8e2
libcontainerd: use healthcheck to track containerd conn
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e4ddcb37c1326e8eef7abbcc84effb016c7a3336
Component: engine
2016-09-12 14:22:38 -07:00
63c413223c
Merge pull request #26448 from michael-holzheu/PR-libnetwork-bump-to-fix-s390x-ci
...
Vendor libnetwork @51d88e9ae63f
Upstream-commit: 130db0a4894abea39f6e9503711804d2807628bd
Component: engine
2016-09-10 06:00:32 -07:00
7e3f0fe810
Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits
...
Restrict size to 2 fractional digits for `docker images`
Upstream-commit: 4c3f2e7c376c83593188f6548652e9261209c908
Component: engine
2016-09-10 11:32:45 +02:00
