86df94b9ba
Merge pull request #27369 from cezarsa/hc
...
Add --health-* flags to service create and update
Upstream-commit: f860289131e36ad2dde5ebe60d15a86fd97934b5
Component: engine
2016-10-28 21:59:52 +02:00
500367df6e
Merge pull request #27860 from vdemeester/update-go-connections-vendor
...
Update go-connections vendoring
Upstream-commit: f391f9c3b9e3db1149e6bc13ee2117cb69e6a617
Component: engine
2016-10-28 12:01:59 -07:00
28336d95ca
Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge
...
Fix issue for `--fixed-cidr` when bridge has multiple addresses
Upstream-commit: 1e989abefba1a424b95d3fc1474e489ace747598
Component: engine
2016-10-28 11:05:01 -07:00
1fa0d4beb8
Update go-connections vendoring
...
This makes possible to use IPv6 addresses in the `--publish` flag of
docker (`run`, …)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 609c183ae7092c60b61021e61f181ae67dea331a
Component: engine
2016-10-28 09:35:30 -07:00
4432c92e1d
vendor: update swarmkit
...
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com >
Upstream-commit: fd657a10d093d5dc838a07098054d0b855718f3b
Component: engine
2016-10-28 00:37:39 -02:00
52c41330fb
Merge pull request #27774 from runcom/vendor-distr
...
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
Upstream-commit: 4e6cb66ecc401bb748bb0db69b1925ca22867d6a
Component: engine
2016-10-27 17:07:03 -07:00
fede704b07
Merge pull request #25820 from crosbymichael/prom
...
Add metrics output to docker
Upstream-commit: 33474a11fea50d50c1d365b29b94b978b2b6fff7
Component: engine
2016-10-27 16:44:26 -07:00
2a9003b823
Add basic prometheus support
...
This adds a metrics packages that creates additional metrics. Add the
metrics endpoint to the docker api server under `/metrics`.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Add metrics to daemon package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
api: use standard way for metrics route
Also add "type" query parameter
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Convert timers to ms
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 3343d234f3b131d4be1d4ca84385e184633a79bd
Component: engine
2016-10-27 10:34:38 -07:00
1826752c1b
Vendor libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d
...
This fix updates libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: fc62ad6b95a19d704bd64bcbe70f355ac2230026
Component: engine
2016-10-27 09:13:25 -07:00
d68cad7965
Update hcsshim to v0.5.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: f9adce18c731188e30dc0c8b00764bebcb9befd4
Component: engine
2016-10-26 15:39:35 -07:00
907d8fbad9
Revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421
...
This fix revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421.
Related docker PR and issues:
(#27567 )
(#25437 )
(#26988 )
(#25644 )
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: bb568f80975ac8a92802ef39f71302b26aaf3100
Component: engine
2016-10-26 06:49:39 -07:00
2c601824ac
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 78a429a97ac110e986c150a57507163dfe223f46
Component: engine
2016-10-26 10:55:50 +02:00
8c5b951858
Merge pull request #27748 from amitkris/uprev_certificate_transparency
...
Uprev google/certificate-transparency to include Solaris support
Upstream-commit: 77f4c30a21ae029bc953d5f106ed8d955d21e244
Component: engine
2016-10-25 16:21:06 -07:00
62c252366f
Merge pull request #27735 from justincormack/completions-tgz
...
Add shell completions to tgz
Upstream-commit: 280eadf9bfbe328d6f18aa46d5ba4bad1f3f1d2a
Component: engine
2016-10-25 15:46:45 -07:00
c457ba5205
Uprev google/certificate-transparency to include Solaris support
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
Upstream-commit: 16db092af2b5a58c41898f275638203470612be9
Component: engine
2016-10-25 13:14:57 -07:00
ea2938292a
Merge pull request #27519 from justincormack/proxy-build
...
Build docker-proxy from git checkout like other external binaries
Upstream-commit: 36f47aa2527f83d7ca7254c43eb08ffc5ce1102e
Component: engine
2016-10-25 08:54:13 -07:00
30025daf04
Add shell completions to tgz
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 1c6f5b5fff92fcb6220da7b9422f4d6134985fdf
Component: engine
2016-10-25 13:43:55 +01:00
44e77a4b4f
Build docker-proxy from git checkout like other external binaries
...
This means we can vendor libnetwork without special casing, and
it is built the same way as the other external binaries.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 3996975b0840033bda3919440d122d734a4bc66b
Component: engine
2016-10-25 13:13:22 +01:00
11895badbe
Merge pull request #27223 from mlaventure/merge-experimental
...
Make experimental a runtime flag
Upstream-commit: ba41a5edac16857121779434cd80b86dcdb0ffda
Component: engine
2016-10-24 16:58:32 -07:00
9a299b360f
Make experimental a runtime flag
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
2016-10-24 15:20:01 -07:00
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
36c938c12b
Merge pull request #27117 from dnephin/swagger-gen
...
Add swagger.yaml and generate a few types from the spec
Upstream-commit: 3c385b9f6b820ae3badfbdcca589377e9a75e7fb
Component: engine
2016-10-21 18:15:28 -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
9a717de600
Exclude generated types from linting.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4bfa2e634cec20685760abbeb605bcf1426f41d0
Component: engine
2016-10-20 13:24:23 -07:00
0220fa6540
Generate plugin types from the swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6f7b69b63f172e9c687416ac1445b2c016f39ff6
Component: engine
2016-10-20 13:24:23 -07:00
3f110de0ac
Add whitespace and create a script to run generation
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 02e1ffd76c517f8b9832fada9ba31445f90f2d7f
Component: engine
2016-10-20 13:24:23 -07:00
2f7fc91dd4
Merge pull request #27470 from runcom/expose-exec-pid
...
record pid of exec'd process
Upstream-commit: 13fd75c3dd18e6d57b6b28097fd7e0d0989c1b9e
Component: engine
2016-10-20 21:36:21 +02:00
0a853bdac1
Merge pull request #27556 from LK4D4/unify_install
...
project: unify way of installing runc and containerd
Upstream-commit: ffa0446e8b8a190cb42f6ff6d54acb8d65995e49
Component: engine
2016-10-20 10:13:40 -07:00
e50d97d8c8
project: unify way of installing runc and containerd
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 179479c6cdf44a2fd3d4ba2ce5dc176bc22ca9bf
Component: engine
2016-10-20 08:50:02 -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
774705a707
Merge pull request #27514 from crosbymichael/update-init-oct18
...
Update docker-init to 74341e923bdf06cfb6b70cf54089
Upstream-commit: a4125e2265ef8994e666af667e64b9a9a4133c73
Component: engine
2016-10-20 16:58:26 +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
9aa2d11ea2
Update docker-init to 74341e923bdf06cfb6b70cf54089
...
Fixes a bug with background processes after the child process exits.
diff:
74341e923bcrosbymichael@gmail.com >
Upstream-commit: 3c3ba4cb662b0a19d5821470dd534279f18699fa
Component: engine
2016-10-18 14:45:43 -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
16e8ef0b4d
cleaning up more stuff in vendor
...
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com >
Upstream-commit: 2ce76c0696a603d8cca1433c6aa9b4325a711d53
Component: engine
2016-10-18 09:20:41 -02: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
1f94129ec0
Merge pull request #27293 from anusha-ragunathan/use-pluginv2-authz
...
Make authz use pluginv2
Upstream-commit: 8658748ef716e43a5f6d834825d818012ed6e2c4
Component: engine
2016-10-13 00:28:43 +02: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
60ebef1784
Merge pull request #27005 from lizzha/azurechina
...
Use the mirror in China for Azure China environment
Upstream-commit: 8d6e9f0c6ac6c77dee3b5a984c19c699660f7abb
Component: engine
2016-10-11 13:04:11 -07:00
