Commit graph

749 commits

Author SHA1 Message Date
Darren Stahl
af08f44640 Revendor go-winio to v0.3.7
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 873a26697d)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-22 16:17:33 -08:00
Tibor Vass
63277b0aff vendor go-connections to error out if unix socket path is too long
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e2e7ab655f)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-22 16:16:24 -08:00
Vincent Demeester
9302b0f59c Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719
This fixes services networks list to be ignored when loading.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 01b70a95c9)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-22 11:27:28 -08:00
Darren Stahl
8ebbeda5a8 Update hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit baac0ef67f)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-22 11:24:21 -08:00
Brian Goff
fcb64b6e08 re-vendor syslog log driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 00caf03132)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-21 14:46:48 -08:00
Vincent Demeester
f44e2dca56 Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit b0903c9db0)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-21 11:48:27 -08:00
Vincent Demeester
c8e2552827 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>
(cherry picked from commit 3bd64de7a9)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-21 11:48:22 -08:00
Vincent Demeester
cbff9474d2 Merge pull request #28604 from aluzzardi/1.13-swarmkit-revendor
1.13.x: Re-vendor swarmkit to a2080913b9cf2cac309845a28902896d65d3f527
2016-11-21 15:09:35 +01:00
Brian Goff
f7ae8204cb Merge pull request #28489 from vieux/1.13.0-rc2-cherrypicks
1.13.0-rc2 cherry-picks : part 2
2016-11-20 10:43:55 -05:00
Kenfe-Mickael Laventure
47ccfcc09f Update containerd & runc
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 8b1aeb22fe)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-18 15:15:19 -08:00
Nishant Totla
1af49192e4 Updating docker/distribution vendoring
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit d910781c66)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-18 13:40:06 -08:00
Andrea Luzzardi
0be7359265 1.13.x: Re-vendor swarmkit to a2080913b9cf2cac309845a28902896d65d3f527
Includes:
- https://github.com/docker/swarmkit/pull/1749
- https://github.com/docker/swarmkit/pull/1753
- https://github.com/docker/swarmkit/pull/1760
- https://github.com/docker/swarmkit/pull/1762
- https://github.com/docker/swarmkit/pull/1764
- https://github.com/docker/swarmkit/pull/1765

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-18 13:39:53 -08:00
Andrea Luzzardi
73bf1ec999 1.13.x: Re-vendor SwarmKit to 577d6bf89a474d3f459804efc5f160ba9fff2b5d
Includes https://github.com/docker/swarmkit/pull/1746

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-16 18:10:07 -08:00
Andrea Luzzardi
7a457451f6 Revendor swarmkit to 3076318ec0327e22c837c2bfdfacea08124dc755
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-15 19:04:09 -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
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