Граф коммитов

877 Коммитов

Автор SHA1 Сообщение Дата
Daniel Nephin f5af9b9738 Replace vendor of aanand/compose-file with a local copy.
Add go-bindata for including the schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-27 16:17:24 -05:00
Daniel Nephin 32425d3add Add deps to test compose-file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-27 16:17:24 -05:00
Tõnis Tiigi aecb79ff98 Merge pull request #29339 from dmcgowan/plugins-abstract-download-manager
Abstract layerstore from pull/push distribution code
2016-12-19 13:32:28 -08:00
Derek McGowan 61ac7c4bf8
Update distribution vendor for manifest builder change
Manifest builder allows setting the configuration type
for the manifest being build. Additionally the default
type has been renamed to reflect it is an image type.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2016-12-19 10:54:55 -08:00
Akihiro Suda ff2f875574 vendor: google.golang.org/cloud -> cloud.google.com/go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-16 08:36:18 +00:00
Akihiro Suda 44b95265df vendor oauth2@96382aa0 and add its deps
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-16 04:37:47 +00:00
Aaron Lehmann 423ba6f223 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 17:02:48 -08:00
Madhu Venugopal 8e6969d846 Vendor libnetwork with experimental daemon flag handling
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-13 14:22:48 -08:00
Santhosh Manohar b6b6d3ade4 Vendor libnetwork @4df06c4
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-12-12 00:29:54 -08:00
Yong Tang 3c1c992271 Revendor swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f
This fix updates swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f.

This fix is needed by #29074 (docker PR) and is related to
docker/swarmkit#1789 (swarmkit PR) and #29044

This fix may be needed for 1.13.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-09 16:28:51 -08:00
Victor Vieux ab65ac6bc4 Merge pull request #29233 from aaronlehmann/vendor-swarmkit-5fe1f720
Update vendored swarmkit to 5fe1f720
2016-12-09 14:49:14 -08:00
Victor Vieux c1a1b381f9 Merge pull request #28459 from dmcgowan/plugin-repository-pinning
Plugin repository pinning
2016-12-08 11:28:52 -08:00
Aaron Lehmann 4441e390d0 Update vendored swarmkit to 5fe1f720
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-07 18:06:28 -08:00
Akihiro Suda 7375507eea Vendor swarmkit
Update swarmkit to deec7ba2c4ef48f20ebe9674afbcced606a5339e, from the master branch.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-05 04:56:40 +00:00
Madhu Venugopal 8f082e418b Vendoring libnetwork to address some concurrency issues
Addresses #28697, #28845, #28712, #26111

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-30 09:31:19 -08:00
Andrea Luzzardi 51247185a2 revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-22 17:01:02 -08:00
Anusha Ragunathan 23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes
Plugin miscellaneous fixes
2016-11-22 16:12:37 -08:00
Sebastiaan van Stijn 61d9ba930c Merge pull request #28685 from darrenstahlmsft/RevendorGowinio
Revendor go-winio to v0.3.7
2016-11-22 21:35:45 +01:00
Tõnis Tiigi d1a137b10c Merge pull request #28681 from aboch/vnd
Vendor libkv @ 1d84310
2016-11-22 11:46:22 -08:00
Darren Stahl 873a26697d Revendor go-winio to v0.3.7
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-22 10:39:42 -08:00
Vincent Demeester 01b70a95c9
Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719
This fixes services networks list to be ignored when loading.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-22 13:09:17 +01:00
Sebastiaan van Stijn fc488328b1 Merge pull request #28671 from darrenstahlmsft/RevendorHcshim
Update hcsshim to v0.5.9
2016-11-22 10:48:20 +01:00
Derek McGowan d1f5e0f7a6
Update vendor distribution
Distribution client change for class in resource

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-21 22:18:41 -08:00
Tibor Vass e2e7ab655f vendor go-connections to error out if unix socket path is too long
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-11-21 16:34:10 -08:00
Alessandro Boch f9cff5e267 Vendor libkv @ 1d84310
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 14:07:51 -08:00
Alexander Morozov 9bd7189527 Merge pull request #28673 from aboch/vnd
Vendoring libnetwork @dd0ddde
2016-11-21 13:46:14 -08:00
Alexander Morozov 9326fb1389 Merge pull request #28670 from cpuguy83/update_syslog_driver
re-vendor syslog log driver
2016-11-21 13:19:47 -08:00
Darren Stahl baac0ef67f Update hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-21 11:45:32 -08:00
Alessandro Boch 948c7fdb94 Vendoring libnetwork @dd0ddde
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 11:44:58 -08:00
Madhu Venugopal 111a95fb50 Merge pull request #28562 from tomdee/bump-libnetwork
Update libnetwork version for IPv6 support
2016-11-21 11:30:00 -08:00
Brian Goff 00caf03132 re-vendor syslog log driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-21 14:24:53 -05:00
Vincent Demeester 3739c3bed3 Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
Add support for healthcheck in compose to swarm
2016-11-21 10:28:37 +01:00
Tom Denham d96baf28d4 Update netlink library (required for libnetwork)
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2016-11-19 16:12:39 -08:00
Tom Denham 5b76fe4a35 Update libnetwork to latest version
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2016-11-19 16:12:32 -08:00
Victor Vieux a0866bd679 Merge pull request #28599 from aluzzardi/revendor-swarmkit
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
2016-11-18 16:23:54 -08:00
Andrea Luzzardi e35c1747f5 Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-18 13:32:26 -08:00
Kenfe-Mickael Laventure 8b1aeb22fe Update containerd & runc
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-18 08:15:20 -08:00
Vincent Demeester 3bd64de7a9
Add support for healthcheck in composefile v3
`docker stack deploy` now supports a composefile v3 format that have a
healthcheck.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-18 15:09:13 +01:00
Vincent Demeester b0903c9db0
Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-18 15:08:29 +01:00
Andrea Luzzardi fbe8790759 Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-16 18:15:15 -08:00
Nishant Totla d910781c66
Updating docker/distribution vendoring
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-11-14 15:31:25 -08:00
Tõnis Tiigi d06b1e2cc2 Merge pull request #28285 from vieux/try_arm_fix_libnetwor
update libnetwork to fix ARM tests
2016-11-11 08:32:29 -08:00
Vincent Demeester bc739a8d70 Update swarmkit to efd44df04cc0fd828de5947263858c3a5a2729b1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 15:18:34 +01:00
Ian Campbell f02221a794 pkg/jsonmessage: Use terminfo rather than open coding ANSI escape codes
Although our use of ANSI codes here is rather simple it is generally good
practice to use terminfo in order to be portable to different terminal
emulators.

Vendor github.com/Nvveen/Gotty (actually my fork with a fix, see
https://github.com/Nvveen/Gotty/pull/1) and use that to parse the terminfo
files.

Note that "\e]2K" (clear entire line) is not covered by terminfo. We can
achieve the same end by first clearing from begining of line to cursor
(el1="\e]1K") and then clearing from cursor to end of line (el="\e]k").

Test suite has been updated and forces (either directly or by setting $TERM to
something highly unlikely to exist) the use of the non-terminfo fallbacks which
retains the same output behaviour as previously. This is preferable even to
relying on a well-known and relatively static terminfo (like vt102) since even
that in principal might have different terminfo encodings.

In case terminfo is not available at all for $TERM or doesn't expose the
specific capabilities which we use then fall back to the previous manual
escapes, with the exception that we avoid "\e]2K" as discussed above.

Tested with a manual docker pull with rxvt-unicode ($TERM=rxvt-unicode), xterm
($TERM=xterm), mlterm ($TERM=mlterm) and aterm ($TERM=kterm).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-11 11:40:53 +00:00
Vincent Demeester f3dcae7dd3 Update compose-file to 8cff34df885ef07824138236bc4d27d359888b17
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-11 11:25:57 +01:00
Victor Vieux 84264e9461 fix ARM unsafe access
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 23:55:38 -08:00
Tõnis Tiigi 48a0c3e831 Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
Fix registry authorization errors
2016-11-10 19:39:28 -08:00
Victor Vieux 750d634d62 Merge pull request #27998 from dnephin/compose-on-swarm
Support `docker stack deploy` from a Compose file
2016-11-10 17:59:57 -08:00
Derek McGowan 60ecc132c5
Update distribution vendor
Pull in client changes to handle oauth errors

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-10 17:34:12 -08:00
Victor Vieux acd6e0d9b2 Merge pull request #28226 from vieux/exit_exp_plugin
move plugins out of experimental
2016-11-10 17:30:54 -08:00
Tõnis Tiigi d54f4472fd Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
Fix failure to get containers when deleting a layer
2016-11-10 17:10:05 -08:00
Victor Vieux 970b23db2e update media_type
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 15:51:32 -08:00
Darren Stahl d0e1949d22 Vendor update hcsshim to v0.5.8
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-10 14:06:57 -08:00
Victor Vieux f700a86dc0 Merge pull request #28257 from sanimej/iptables
vendor libnetwork @1861587
2016-11-10 14:01:02 -08:00
Santhosh Manohar 90bc2756ed vendor libnetwork @1861587
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-11-10 12:04:28 -08:00
cyli b399d29a57 Vendor the latest swarmkit PR
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-11-10 11:53:02 -08:00
Sandeep Bansal 6e95165679 Vendoring latest swarmkit and libnetwork
Signed-off-by: Sandeep Bansal <msabansal@microsoft.com>
2016-11-10 09:54:47 -08:00
Daniel Nephin ed35648151 Vendor dependencies for compose-file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
Tonis Tiigi b4a667c8c4 Add support for swarm init lock and swarm unlock
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-09 16:09:00 -08:00
Tonis Tiigi 472ecae0d8 vendor: update errors to 839d9e91
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-09 16:09:00 -08:00
Tonis Tiigi 2a68f0f001 vendor: update swarmkit to bddd3f0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-09 16:08:52 -08:00
Victor Vieux 8ffd1a370c Merge pull request #28025 from vdemeester/swarm-mode-templating
Add support for swarm mode templating
2016-11-09 15:57:52 -08:00
Tibor Vass 5e3d777401 Merge pull request #28002 from Microsoft/jjh/noreexec
Windows: Allow a no-reexec option for importLayer
2016-11-09 14:46:21 -08:00
Vincent Demeester 6212ea669b
Add support for swarm mode templating
Wire templating support of swarmkit for the engine, in order to be used
through services.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-09 23:28:06 +01:00
Vincent Demeester 6e885540a2 Update swarmkit to 00890359d8bfba630824b66b848dbf7851149fef
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-09 22:38:24 +01:00
Evan Hazlett 1310dadf4a secrets: vendor swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: vendor swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2016-11-09 14:27:43 -05:00
John Howard d936a77160 Revendor Microsoft/go-winio to v0.3.6
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 17:59:01 -08:00
John Howard 8ae9160643 Revendor Microsoft/HCSShim v0.5.7
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-08 12:09:11 -08:00
Brian Goff 16ea0806f8 Merge pull request #28140 from tonistiigi/update-fifo
vendor: update fifo to 14056439
2016-11-08 12:31:03 -05:00
Yong Tang f0e2eb24cf Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
This fix revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0.

This fix is related to 28031.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-07 17:57:20 -08:00
Tonis Tiigi bebfcade04 vendor: update fifo to 14056439
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-07 16:19:03 -08:00
Dong Chen aba4190612 Vendor libnetwork a98901aebe7ce920b6fbf02ebe5c3afc9ca975b8.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-11-04 21:50:56 -07:00
Sebastiaan van Stijn 1c62d8619d Merge pull request #28081 from LK4D4/update_for_solaris
vendor: update package for solaris support
2016-11-04 17:01:16 -07:00
Alexander Morozov bb1153a613 Merge pull request #28077 from aluzzardi/swarmkit-revendoring
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
2016-11-04 14:59:05 -07:00
Alexander Morozov 553b0b9731 vendor: update package for solaris support
Update includes next packages:
* golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
* github.com/fsnotify/fsnotify v1.2.11
* github.com/tonistiigi/fifo b4c3a126bac4051ae3fa83bfcb3c60ab7a9da0dd

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-04 14:39:47 -07:00
Victor Vieux f6edbdf883 Merge pull request #28010 from vieux/fix_experimental_client
always add but hide experimental cmds and flags
2016-11-04 13:49:19 -07:00
Andrea Luzzardi 014eeb539b Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-04 12:26:37 -07:00
Andrea Luzzardi 9322636c89 Revendor go-memdb to floridoo/go-memdb's fork (608dda3b1410a73eaf3ac8b517c9ae7ebab6aa87)
We are temporarily using a fork containing a PR that hasn't been merged
upstream yet.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-04 12:26:37 -07:00
Victor Vieux d34ca0178e update cobra and use Tags
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-04 12:04:14 -07:00
Justin Cormack c5251f7116 Use runc version built without ambient capabilities
Until we can support existing behaviour with `sudo` disable
ambient capabilities in runc build.

Add tests that non root user cannot use default capabilities,
and that capabilities are working as expected.

Test for #27590

Update runc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-11-04 17:25:28 +00:00
Alexander Morozov f2614f2107 project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-03 15:31:46 -07:00
Madhu Venugopal 2d676d38a0 Merge pull request #28019 from sanimej/vendor
Vendoring libnetwork @9ab6e13
2016-11-03 14:35:28 -07:00
Santhosh Manohar 8479a765dd Vendoring libnetwork @9ab6e13
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-11-03 10:58:47 -07:00
John Howard 3b6cd20b0b Vendor davecgh/gospew @ 6d212880
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-03 09:35:58 -07:00
Tibor Vass 1e51f99684 Merge pull request #27918 from dmcgowan/use-system-certs
Merge system certificate pool with custom certificates
2016-11-02 13:51:58 -07:00
Vincent Demeester cff3cdd35a
Update swarmkit to 4dfc88ccce14ced6f0a6ea82d46dca004c6de0e2
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-02 19:43:27 +01:00
Derek McGowan fd82240e0a
Update go connections vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-10-31 13:38:40 -07:00
Laura Frank ba4e0c328f Updating aws-sdk-go to version 1.4.22
Signed-off-by: Laura Frank <ljfrank@gmail.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-10-31 09:23:45 -07:00
Vincent Demeester f860289131 Merge pull request #27369 from cezarsa/hc
Add --health-* flags to service create and update
2016-10-28 21:59:52 +02:00
Brian Goff f391f9c3b9 Merge pull request #27860 from vdemeester/update-go-connections-vendor
Update go-connections vendoring
2016-10-28 12:01:59 -07:00
Michael Crosby 1e989abefb Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge
Fix issue for `--fixed-cidr` when bridge has multiple addresses
2016-10-28 11:05:01 -07:00
Vincent Demeester 609c183ae7
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>
2016-10-28 09:35:30 -07:00
Cezar Sa Espinola fd657a10d0
vendor: update swarmkit
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
2016-10-28 00:37:39 -02:00
Tibor Vass 4e6cb66ecc Merge pull request #27774 from runcom/vendor-distr
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
2016-10-27 17:07:03 -07:00
Sebastiaan van Stijn 33474a11fe Merge pull request #25820 from crosbymichael/prom
Add metrics output to docker
2016-10-27 16:44:26 -07:00
Michael Crosby 3343d234f3 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>
2016-10-27 10:34:38 -07:00
Yong Tang fc62ad6b95 Vendor libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d
This fix updates libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-10-27 09:13:25 -07:00
Darren Stahl f9adce18c7 Update hcsshim to v0.5.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-26 15:39:35 -07:00
Yong Tang bb568f8097 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>
2016-10-26 06:49:39 -07:00
Antonio Murdaca 78a429a97a
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-26 10:55:50 +02:00
Amit Krishnan 16db092af2 Uprev google/certificate-transparency to include Solaris support
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-10-25 13:14:57 -07:00
Alexander Morozov 36f47aa252 Merge pull request #27519 from justincormack/proxy-build
Build docker-proxy from git checkout like other external binaries
2016-10-25 08:54:13 -07:00
Justin Cormack 3996975b08 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>
2016-10-25 13:13:22 +01:00
Vincent Demeester 67b85f9d26 Merge pull request #26354 from KingEmet/fixbranch
make GetAll use client.List as the source of truth
2016-10-24 14:25:24 -07:00
Sebastiaan van Stijn 32b541e443 Merge pull request #27405 from tonistiigi/fix-fifo2
Fix issues with fifos blocking on open
2016-10-21 09:44:33 -07:00
allencloud 3cff9e0267 revendor go-units to update more accurate time display
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-10-21 11:05:11 +08:00
Tonis Tiigi 6d26464502 Fix issues with fifos blocking on open
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-10-20 17:02:02 -07:00
Aaron Lehmann 12a4ed0317 Vendor swarmkit in master
Also, update libnetwork and grpc.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-20 13:49:22 -07:00
Aaron Lehmann 2c620d0aa2 Merge pull request #27287 from mavenugo/pluginv2-sk2
Allow multiple handlers to support network plugins in swarm-mode
2016-10-20 13:43:04 -07:00
Antonio Murdaca 1808348136
record pid of exec'd process
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-20 17:06:11 +02:00
Tõnis Tiigi 9f30c28d21 Merge pull request #26983 from aaronlehmann/logrus-wrapped-errors
Fix problems with wrapped errors in logrus
2016-10-19 10:16:01 -07:00
Daniel Nephin 4e4da146ec Update sfp13/pflag
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-18 17:17:22 -07:00
Aaron Lehmann 738131faae 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>
2016-10-18 17:14:59 -07:00
Alexander Morozov 329f272fd5 Merge pull request #27474 from tagomoris/identify-fluentd-driver-stops-after-restarts
Update fluent-logger-golang to v1.2.1
2016-10-18 12:47:13 -07:00
Carlos Alexandro Becker 2ce76c0696
cleaning up more stuff in vendor
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
2016-10-18 09:20:41 -02:00
Sebastiaan van Stijn 24582e8153 Merge pull request #27471 from caarlos0/logentries
Added Logentries Driver
2016-10-18 01:33:28 -07:00
Satoshi Tagomori 53ed17449e 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>
2016-10-18 11:26:32 +09:00
Carlos Alexandro Becker 0f4db1cc59
Added logentries dependency to vendor
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
2016-10-17 22:06:39 -02:00
Madhu Venugopal 88cae7412d Vendoring Swarmkit 1fed8d2a2ccd2a9b6d6fb864d4ad3461fc6dc3eb
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-10-15 08:49:55 -07:00
cyli 5f4dcd8252 Bump vendored and dockerfile notary version to v0.4.2
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-10-14 17:52:56 -07:00
Jana Radhakrishnan 9ae9f9812b Vendoring libnetwork @04025f2a2eebb
Fixes #27323

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-14 11:12:24 -07:00
Anusha Ragunathan 1845f506e4 Vendor libnetwork.
This is primarily for plugingetter import path change.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-11 13:09:01 -07:00
Madhu Venugopal 5ff17cb4aa Merge pull request #26954 from mrjana/net
Vendoring libnetwork @7b74403
2016-10-11 05:59:35 -07:00
John Howard 97ac469934 Windows: Update go-winio to 0.3.5
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-10 15:08:17 -07:00
Jana Radhakrishnan 83ba14a552 Vendoring libnetwork @7b74403be424
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-10-10 14:39:02 -07:00
Justin Cormack 5ee2c2a647 Merge pull request #27160 from mlaventure/update-containerd
Update containerd and runc
2016-10-06 19:36:31 +02:00
Kenfe-Mickael Laventure 7e12c3bb99 Update containerd and runc
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-05 14:47:15 -07:00
Darren Stahl 267c04aa36 Revendor hcsshim to v0.5.1
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-10-05 14:40:51 -07:00
Alexander Morozov 921a0bf686 Merge pull request #26932 from dmcgowan/update-tar-split
Update tar split
2016-10-05 13:45:07 -07:00
Michael Crosby 214b70e6ef Merge pull request #27038 from jstarks/non_base_utilityvm
Windows: support Windows servicing layers
2016-10-05 10:02:31 -07:00
John Starks cab70c391f 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>
2016-10-03 11:00:04 -07:00
Anusha Ragunathan 009f741351 Vendor docker/swarmkit changes.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-03 10:59:38 -07:00
Anusha Ragunathan 2b0f0d0d71 Vendor in docker/libnetwork.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-10-03 10:40:05 -07:00
Michael Crosby 97660c6ec5 Merge pull request #26961 from Microsoft/jjh/oci
Windows: OCI runtime spec compliance
2016-09-30 10:13:57 -07:00
John Howard ba2df17493 Revendor OCI runtime-spec 1c7c27d043c2
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-27 12:05:47 -07:00
Derek McGowan e338217770
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)
2016-09-27 09:57:56 -07:00
Yong Tang 8f4afb86ee Revendor swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
This commit updates swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-09-26 23:48:16 -07:00
Yong Tang f4e94617f0 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>
2016-09-24 12:14:04 -07:00
Jana Radhakrishnan cd20621201 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>
2016-09-23 16:06:38 -07:00
Jake Sanders b264632904 make GetAll use client.List as the source of truth
Signed-off-by: Jake Sanders <jsand@google.com>
2016-09-23 11:48:15 -07:00
Jana Radhakrishnan 746113d584 Vendoring libnetwork @6caf9022fa09
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-22 21:00:32 -07:00
msabansal 522930cfb3 Vendoring dependencies
Signed-off-by: msabansal <sabansal@microsoft.com>
2016-09-22 12:21:28 -07:00
Sebastiaan van Stijn 45818d6fc4
Removed engine-api leftovers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-21 12:36:52 +02:00
Vincent Demeester 758a809f54 Merge pull request #26538 from LK4D4/update_grpc
Update grpc to v1.0.1-GA
2016-09-20 23:19:26 +02:00
Alexander Morozov eeceb0ccc8 vendor: update containerd and swarmkit
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-20 09:24:36 -07:00
Satoshi Tagomori 87124b9d62 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>
2016-09-20 20:31:22 +09:00
Brian Goff f528690674 re-vendor syslog package
Fixes #26394

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-17 10:25:05 -04:00
Tõnis Tiigi 4adbd5338d Merge pull request #26583 from aboch/vnd
Vendoring libnetwork @c8ce8c7
2016-09-15 20:28:07 -07:00
Alexander Morozov afe23cea3d vendor: update grpc and protobuf
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-15 11:36:31 -07:00
Alessandro Boch 5cfbdceafe Vendoring boltdb @fff57c100
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-09-15 10:53:48 -07:00