Commit graph

659 commits

Author SHA1 Message Date
Vincent Demeester
6ec4a640de
Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-07 11:32:09 +02:00
Brian Goff
db271b8833 re-vendor swarmkit
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
Brian Goff
140ec59db6 re-vendor engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
Antonio Murdaca
8aa37bdbb7 vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-06 13:12:37 +02:00
Tibor Vass
93731a6350 Merge pull request #24230 from mlaventure/vendor-containerd
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
2016-07-01 13:26:28 -07:00
Kenfe-Mickael Laventure
2685c82c2e Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-01 11:46:48 -07:00
Tonis Tiigi
54255f53d8 Vendor updated swarmkit, libnetwork, engine-api
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 17:21:39 -07:00
Nishant Totla
af5df117a8
Updating header name and executor
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-29 13:26:19 -07:00
Sebastiaan van Stijn
1c06ebeeee Merge pull request #23950 from jstarks/no_clone_tp5
Windows: Disable VM cloning for TP5 image
2016-06-27 15:13:50 -07:00
Michael Crosby
7db7e04631 Update containerd to b93a33be39bc4ef0fb00bfcb79147
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-27 11:45:05 -07:00
John Starks
e602225160 Revendor github.com/Microsoft/hcsshim
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-06-24 16:12:43 -07:00
Vincent Demeester
18398b2933 Merge pull request #23859 from aboch/vnd
Update check-config.sh, netlink and libnetwork vendoring
2016-06-23 20:34:02 +02:00
Alexander Morozov
138f9538f3 Merge pull request #23776 from Microsoft/ShutdownError
Windows: Prevent logging errors when shutting down an already shut down container
2016-06-22 12:11:00 -07:00
Alessandro Boch
e26c513fa8 Vendoring libnetwork ed311d0
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 09:40:20 -07:00
Alessandro Boch
58b8b8fa15 Vendoring vishvananda/netlink 734d02c
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 09:37:17 -07:00
Darren Stahl
ee59c53c2f Revender hcsshim to v0.3.5
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-20 16:56:13 -07:00
Jana Radhakrishnan
663159e9ac Vendoring @ab62dd6bf06bf0
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-18 19:19:13 -07:00
Jana Radhakrishnan
64a567d24c Vendoring swarmkit @3f135f206179e
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 19:01:18 -07:00
Jana Radhakrishnan
70e2585d54 Vendoring libnetwork @13be89d1cf79
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 10:27:34 -07:00
Arnaud Porterie
0ef720eded Merge pull request #23643 from tonistiigi/membership
Return membership status on join without timeout
2016-06-17 01:40:06 +00:00
Arnaud Porterie
7ef9aec90f Merge pull request #23570 from vdemeester/change-plugin-install
Update docker plugin install code…
2016-06-17 00:12:56 +00:00
Michael Crosby
eb6cc31802 Merge pull request #23639 from mavenugo/ln-rc2
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
2016-06-16 16:17:07 -07:00
Vincent Demeester
58529a1553
Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-17 00:32:58 +02:00
Tonis Tiigi
2783568284 Update swarmkit to 310f1119
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 15:06:27 -07:00
Madhu Venugopal
7f2f6ed0d6 Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-16 14:33:36 -07:00
Tõnis Tiigi
6577031787 Merge pull request #23606 from vieux/fix_secrets
fix docker swarm init/update --secret
2016-06-16 14:24:35 -07:00
Arnaud Porterie
9cdb6357e2 Merge pull request #23603 from mlaventure/revert-runc-to-mainstream
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
2016-06-16 05:08:44 +00:00
Victor Vieux
085895342c fix docker swarm init/update --secret
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-15 17:05:10 -07:00
Kenfe-Mickael Laventure
b675124cf5 Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-15 15:11:50 -07:00
Michael Crosby
e927df7b4b Update libnetwork to 96d45528599c32354230480a1ebc0
This fixes an issue with hanging tests due to store.

Fixes #23560

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-15 15:07:04 -07:00
Madhu Venugopal
5af8e2a9c0 Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-14 19:50:34 -07:00
Madhu Venugopal
f2f97f768e Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-14 19:50:34 -07:00
Arnaud Porterie
91197953d0 Merge pull request #23524 from aboch/restore
Daemon to support network restore
2016-06-15 02:33:16 +00:00
Arnaud Porterie
574f7d2149 Merge pull request #23551 from tonistiigi/update-swarmkit
Update swarmkit to 25572005f
2016-06-15 02:25:31 +00:00
Tonis Tiigi
cdf279d74d Update swarmkit to 25572005f
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-14 17:07:14 -07:00
Tibor Vass
e5b7d36e99 plugins: vendor engine-api to import new plugin types
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-14 14:20:27 -07:00
Alessandro Boch
5b79122146 Vendoring libnetwork 452dff1
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-14 13:45:24 -07:00
Kenfe-Mickael Laventure
2e9ea5c194 Update containerd and runc vendoring
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-14 07:47:31 -07:00
Tonis Tiigi
44793049ce Add dependency to docker/swarmkit
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-13 22:16:18 -07:00
Darren Stahl
d4d8cc9c0a Update vendored hcsshim to v0.3.4
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-10 15:27:05 -07:00
John Howard
30bbf184e9 Merge pull request #23392 from Microsoft/RevendorHcsshim
Revendor hcsshim to v0.3.2
2016-06-09 11:39:39 -07:00
Michael Holzheu
758f9a8ceb Bump seccomp version to enable ppc/s390x seccomp support
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-06-09 05:48:06 -04:00
Darren Stahl
bb1c54bc1f Revendor hcsshim to v0.3.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-08 17:32:22 -07:00
Brian Goff
6fd8c96f61 Merge pull request #23344 from pdalpra/timeout-as-time.Duration
Timeout as time.duration
2016-06-08 16:37:08 -04:00
Michael Crosby
d17b9f3da0 Update containerd to cf554d59dd96e459544748290eb91
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-07 15:27:23 -07:00
Pierre Dal-Pra
66234eaf9b Bump engine-api to 8c2141e14bb9e7540938d155976b3ef0661e4814
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
2016-06-07 18:18:37 +02:00
Sebastiaan van Stijn
f061f556f2 Merge pull request #23269 from vdemeester/migrate-import-to-cobra
Use spf13/cobra for docker import
2016-06-07 13:07:30 +02:00
Arnaud Porterie
7d08f3a5ad Merge pull request #22866 from jstarks/foreign_layers
Support layers from external URLs
2016-06-07 00:27:40 +00:00
Vincent Demeester
ca01e57d55
Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-06 13:58:18 +02:00
Brian Goff
3f970819bb Merge pull request #23063 from yongtang/22961-aws-sdk-go
Update aws-sdk-go to v1.1.30
2016-06-05 16:01:52 -04:00