35302d40a0
Merge pull request #28562 from tomdee/bump-libnetwork
...
Update libnetwork version for IPv6 support
Upstream-commit: 111a95fb500194039cabf670b4cf5b62dcd9ed0e
Component: engine
2016-11-21 11:30:00 -08:00
65ee2f8e99
re-vendor syslog log driver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 00caf03132a1bf1a2a7a389c5f23d6fc81f2bc0b
Component: engine
2016-11-21 14:24:53 -05:00
86d2b2a2e1
Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
...
Add support for healthcheck in compose to swarm
Upstream-commit: 3739c3bed37a3493a20bff3c9abb17561e1a732d
Component: engine
2016-11-21 10:28:37 +01:00
c0b47669c5
Update netlink library (required for libnetwork)
...
Signed-off-by: Tom Denham <tom@tomdee.co.uk >
Upstream-commit: d96baf28d4e8065212b0404c4048420c7f2c5f78
Component: engine
2016-11-19 16:12:39 -08:00
12f8b31660
Update libnetwork to latest version
...
Signed-off-by: Tom Denham <tom@tomdee.co.uk >
Upstream-commit: 5b76fe4a35adac2467658cbc5a2b26469d75f8ca
Component: engine
2016-11-19 16:12:32 -08:00
c257bd40a6
Merge pull request #28599 from aluzzardi/revendor-swarmkit
...
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Upstream-commit: a0866bd679f3099815d44664f7f53d099c66d426
Component: engine
2016-11-18 16:23:54 -08:00
b72665f309
Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: e35c1747f5ebd36ba9d35ded5613e4e4762645d4
Component: engine
2016-11-18 13:32:26 -08:00
5cab628042
Update containerd & runc
...
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 8b1aeb22febdb60e29b4d1ee52c6d4139af1cd62
Component: engine
2016-11-18 08:15:20 -08:00
65faee61a6
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 >
Upstream-commit: 3bd64de7a9c3eecbd57cb11d861a6fe94a5bb788
Component: engine
2016-11-18 15:09:13 +01:00
9b29b94a3c
Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0903c9db0e1fe0226102e3887b5c30474837e97
Component: engine
2016-11-18 15:08:29 +01:00
01fd03f430
Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: fbe87907597dcea5a5ac493689556873b16a809f
Component: engine
2016-11-16 18:15:15 -08:00
cd8c39a1d4
Updating docker/distribution vendoring
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: d910781c66262af95646d7a0b564d254afc4af8f
Component: engine
2016-11-14 15:31:25 -08:00
4a96d47119
Merge pull request #28285 from vieux/try_arm_fix_libnetwor
...
update libnetwork to fix ARM tests
Upstream-commit: d06b1e2cc2fbeec4316885d0f403c96dd34b89d7
Component: engine
2016-11-11 08:32:29 -08:00
45eb178352
Update swarmkit to efd44df04cc0fd828de5947263858c3a5a2729b1
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: bc739a8d70044263b1b71c28b8465fe2c84d3262
Component: engine
2016-11-11 15:18:34 +01:00
d23f15cd3f
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 >
Upstream-commit: f02221a7941948017df68db8fd9a5de7f19453bf
Component: engine
2016-11-11 11:40:53 +00:00
1eaec61ab6
Update compose-file to 8cff34df885ef07824138236bc4d27d359888b17
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f3dcae7dd36daf85de49af9f86145a9c5f5bd15a
Component: engine
2016-11-11 11:25:57 +01:00
87324db99d
fix ARM unsafe access
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 84264e9461e11ee2884830df0768eaea662c5cc9
Component: engine
2016-11-10 23:55:38 -08:00
e297f40024
Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
...
Fix registry authorization errors
Upstream-commit: 48a0c3e831a13c48a2e64558ff38a79b22881f85
Component: engine
2016-11-10 19:39:28 -08:00
ca36766d89
Merge pull request #27998 from dnephin/compose-on-swarm
...
Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
2016-11-10 17:59:57 -08:00
5c38fc2991
Update distribution vendor
...
Pull in client changes to handle oauth errors
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 60ecc132c538129e7093dd38987291651e418035
Component: engine
2016-11-10 17:34:12 -08:00
3baa399d95
Merge pull request #28226 from vieux/exit_exp_plugin
...
move plugins out of experimental
Upstream-commit: acd6e0d9b25c9c8ee4e9a39a69a2a2ac8c1125ec
Component: engine
2016-11-10 17:30:54 -08:00
d19c3e6850
Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
...
Fix failure to get containers when deleting a layer
Upstream-commit: d54f4472fdfad1a9c9b04ed2b50ac010556ab44e
Component: engine
2016-11-10 17:10:05 -08:00
b0b2a12b08
update media_type
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 970b23db2e97e1671c6bf4b57bfe5d1a30e98819
Component: engine
2016-11-10 15:51:32 -08:00
5c8a6f6329
Vendor update hcsshim to v0.5.8
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d0e1949d2280533a57170c9e457ee700fb924ab9
Component: engine
2016-11-10 14:06:57 -08:00
b8314489b1
Merge pull request #28257 from sanimej/iptables
...
vendor libnetwork @1861587
Upstream-commit: f700a86dc01ef65061a695cc8e0694afaff8b334
Component: engine
2016-11-10 14:01:02 -08:00
8c6719d015
vendor libnetwork @1861587
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 90bc2756ed2693ff26f0517abbb060626d9a7284
Component: engine
2016-11-10 12:04:28 -08:00
e2a7e2f897
Vendor the latest swarmkit PR
...
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: b399d29a57dad9c9fe14bf07431eb57a9ef0d2ac
Component: engine
2016-11-10 11:53:02 -08:00
cf52bc83b2
Vendoring latest swarmkit and libnetwork
...
Signed-off-by: Sandeep Bansal <msabansal@microsoft.com >
Upstream-commit: 6e951656792bb3cad17d579a628b333cebcad3e7
Component: engine
2016-11-10 09:54:47 -08:00
2885f048a3
Vendor dependencies for compose-file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ed35648151453f71dc59dc5c971ce132ebbc77c9
Component: engine
2016-11-10 11:28:18 -05:00
f5437c0d78
vendor: update errors to 839d9e91
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 472ecae0d801f71d8b44f4ca7a9fff0b9271799f
Component: engine
2016-11-09 16:09:00 -08:00
1e77cc5379
vendor: update swarmkit to bddd3f0
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 2a68f0f0016caa6cef8d32726002b9ad02a4c56c
Component: engine
2016-11-09 16:08:52 -08:00
174f2a0d72
Merge pull request #28025 from vdemeester/swarm-mode-templating
...
Add support for swarm mode templating
Upstream-commit: 8ffd1a370c447db92a67d17f900ccd453dbcedee
Component: engine
2016-11-09 15:57:52 -08:00
e85707f736
Merge pull request #28002 from Microsoft/jjh/noreexec
...
Windows: Allow a no-reexec option for importLayer
Upstream-commit: 5e3d777401cd96bd9958971533222726edb1caa5
Component: engine
2016-11-09 14:46:21 -08:00
9549c6b9d6
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 >
Upstream-commit: 6212ea669b4e92b3aa3985857f827ee9b95271fd
Component: engine
2016-11-09 23:28:06 +01:00
6f6d63afeb
Update swarmkit to 00890359d8bfba630824b66b848dbf7851149fef
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6e885540a208fe555e3b746d136c84f76e988f8a
Component: engine
2016-11-09 22:38:24 +01:00
5431f2d3ce
secrets: vendor swarmkit
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
secrets: vendor swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 1310dadf4ab3f38b346d78a6cbc7dae045388013
Component: engine
2016-11-09 14:27:43 -05:00
c43241853d
Revendor Microsoft/go-winio to v0.3.6
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d936a77160215f5a9cfe55e49d2afd904b019f8f
Component: engine
2016-11-08 17:59:01 -08:00
226e7112f7
Revendor Microsoft/HCSShim v0.5.7
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8ae916064375693862346f7fbbf3a79aff14d811
Component: engine
2016-11-08 12:09:11 -08:00
4b60a6ae97
Merge pull request #28140 from tonistiigi/update-fifo
...
vendor: update fifo to 14056439
Upstream-commit: 16ea0806f8c49f7126d0c244ca363d2327ba7e50
Component: engine
2016-11-08 12:31:03 -05:00
22b4540407
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 >
Upstream-commit: f0e2eb24cfb6b1e888a93acc971386130e7e99ba
Component: engine
2016-11-07 17:57:20 -08:00
9664466e4b
vendor: update fifo to 14056439
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: bebfcade04e72e2f8ca91e645a96a3759198232b
Component: engine
2016-11-07 16:19:03 -08:00
b91cea3478
Vendor libnetwork a98901aebe7ce920b6fbf02ebe5c3afc9ca975b8.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: aba4190612a2e4f0400e0e992de81aa382299f9b
Component: engine
2016-11-04 21:50:56 -07:00
97826ed120
Merge pull request #28081 from LK4D4/update_for_solaris
...
vendor: update package for solaris support
Upstream-commit: 1c62d8619d3b629cd8aae3bf44a5eb3e17c1cfb9
Component: engine
2016-11-04 17:01:16 -07:00
0606b2f6d5
Merge pull request #28077 from aluzzardi/swarmkit-revendoring
...
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Upstream-commit: bb1153a613933dc25e2a112416ead9106ed00f4c
Component: engine
2016-11-04 14:59:05 -07:00
3db46dc6b5
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 >
Upstream-commit: 553b0b9731c5b2b75af1fa27c17f2a19cf2a0160
Component: engine
2016-11-04 14:39:47 -07:00
20cafdbd7e
Merge pull request #28010 from vieux/fix_experimental_client
...
always add but hide experimental cmds and flags
Upstream-commit: f6edbdf8835359a83e9d5786ffe09d176609fb07
Component: engine
2016-11-04 13:49:19 -07:00
fc88fcd016
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
9dcd59a93e
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 >
Upstream-commit: 9322636c8926f155a10d9679e364e3f8e86203d6
Component: engine
2016-11-04 12:26:37 -07:00
ffbf855e39
update cobra and use Tags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: d34ca0178e42cddc760316bbcb6a3aa8bea8b3ed
Component: engine
2016-11-04 12:04:14 -07:00
b865964d4d
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 >
Upstream-commit: c5251f7116e3d9095a7169fc31bd170dff997c2e
Component: engine
2016-11-04 17:25:28 +00:00
