beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
29743 commits 14 branches 412 tags 338 MiB
Commit graph

110 commits

Author SHA1 Message Date
Kenfe-Mickael Laventure
00132cc442 Update containerd to version 4ab9917febca54791c5f071a9d1f404867857fcc 
This fixes an issue preventing containerd from starting if the state
directory didn't exist already.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-15 08:16:07 -07:00
Aaron Lehmann
6a9acf0b94 Vendor swarmkit 1775645 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-13 17:42:56 -07:00
Victor Vieux
3c3f3204bf Merge pull request #31742 from aaronlehmann/vendor-swarmkit-f93948c 
[17.03.x] Vendor swarmkit f93948c
 2017-03-10 14:10:41 -08:00
Aaron Lehmann
a8b51a3296 Vendor swarmkit f93948c 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-10 11:08:44 -08:00
Kenfe-Mickael Laventure
74c52a7bab Update containerd to 595e75c212d19a81d2b808a518fe1afc1391dad5 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-09 13:50:28 -08:00
Kenfe-Mickael Laventure
030f7b370f Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-08 14:49:32 -08:00
Brian Goff
3a232c89e4 Merge pull request #31311 from aaronlehmann/vendor-swarmkit-1f3e4e6 
[17.03.x] Vendor swarmkit 1f3e4e6
 2017-02-24 09:11:59 -05:00
Aaron Lehmann
bef21471d7 Vendor swarmkit 1f3e4e6 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-02-23 11:07:29 -08:00
Kenfe-Mickael Laventure
e285c70dec Bump runc to a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-02-23 01:05:38 -08:00
Tonis Tiigi
c7f67ed835 vendor: update containerd to 977c511ed 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-02-22 16:04:23 -08:00
Victor Vieux
d1c1b391bc Merge pull request #31170 from aboch/c1.13.x 
[1.13.x/17.03.x] Vendoring libnetwork @ce28404
 2017-02-19 15:42:59 -08:00
Alessandro Boch
855eb121aa Vendoring libnetwork @ce28404 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-02-19 13:35:31 -08:00
Victor Vieux
c9ae02ec59 Merge pull request #31143 from aaronlehmann/vendor-swarmkit-caa9c95 
[1.13] Vendor swarmkit 30a4278
 2017-02-19 00:46:21 -08:00
Victor Vieux
fe375a64db
Merge pull request #31055 from Microsoft/jjh/fix30278 
Windows: Retry workaround for RS1/RS2 compute system enumeration
(cherry picked from commit 7761c69e23)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-02-17 22:04:37 -08:00
Aaron Lehmann
b326920b3e Vendor swarmkit 30a4278 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-02-17 17:46:12 -08:00
Brian Goff
30a5e20cc0 Merge pull request #31011 from aboch/c1.13.x 
[1.13.x] Vendoring libnetwork @bba65e5
 2017-02-15 16:26:27 -05:00
Alessandro Boch
2b0d7d2d86 [1.13.x] Vendoring swarmkit @c7df892 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-02-14 21:08:59 -08:00
Alessandro Boch
2e544b1513 [1.13.x] Vendoring libnetwork @bba65e5 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-02-14 09:42:44 -08:00
Victor Vieux
f6bf85f99c Merge pull request #30730 from dmcgowan/update-go-connections-1.13 
[1.13] Update go connections 1.13
 2017-02-03 20:53:35 -08:00
Derek McGowan
b47fa5a5d1
Update go-connections package 
fixes #30450

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-02-03 16:51:49 -08:00
Alessandro Boch
778f9a86c4 Vendoring libnetwork @45b4086 for 1.13.x 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-02-02 12:58:16 -08:00
Vincent Demeester
fbc84e24aa Merge pull request #30646 from vieux/1.13.1-rc2-cherrypicks-2 
1.13.1 rc2 cherrypicks 2
 2017-02-02 11:31:19 +01:00
Victor Vieux
6e2e808146 Merge pull request #30650 from aluzzardi/1.13.x-swarmkit-bump 
[1.13.x] Re-vendor swarmkit to 1c7f003d75f091d5f7051ed982594420e4515f77
 2017-02-01 15:54:56 -08:00
Andrea Luzzardi
14153795ba Re-vendor swarmkit to 1c7f003d75f091d5f7051ed982594420e4515f77 
Includes docker/swarmkit#1914

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2017-02-01 13:23:39 -08:00
Sebastiaan van Stijn
d00e249c26
[1.13.x] bump RunC / libcontainer to fix SELinux regression 
This bumps RunC and libcontainer to fix a regression
in 1.13 that caused SELinux labels to not be
applied correctly.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-02-01 12:27:00 -08:00
John Howard
7b15b4a9b2 Revendor Microsoft/go-winio v0.3.8 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit da6739c99f)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-02-01 12:00:11 -08:00
Kenfe-Mickael Laventure
0311ed7b1c Update containerd to version aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-31 15:01:55 -08:00
Yong Tang
1e0179589d [1.13.x] Cherry-pick SwarmKit update to 0af40501a9cc98cd3e9425d2e4246dd3eff5526e 
This fix cherry-pick SwarmKit update to 0af40501a9cc98cd3e9425d2e4246dd3eff5526e
for branch 1.13.x. The following has been added:
- [docker/swarmkit#1909]: raft: Disable address change detection
- [docker/swarmkit#1910]: Fix issue in service update of published ports in host mode

This fix fixes #30199 in docker.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-01-30 15:22:48 -08:00
Madhu Venugopal
e6f89d1af5 Vendoring libnetwork 2c8b683 
to address #30295

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-01-26 04:38:21 -08:00
Daniel Nephin
5bf7901f5d 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>
 2017-01-25 16:04:05 -05:00
Anusha Ragunathan
f0f020a579 Vendor swarmkit 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2017-01-25 10:13:26 -08:00
Tõnis Tiigi
fc82c4b391 Merge pull request #30044 from tonistiigi/update-runc-113 
[v1.13] vendor: update runc to 2f7393a4
 2017-01-11 08:37:36 -08:00
Tonis Tiigi
acbad31dcd vendor: update runc to 2f7393a4 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-10 18:07:20 -08:00
Aaron Lehmann
18fd3885c6 Update vendored swarmkit to 296fcfc 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-10 16:07:45 -08:00
Aaron Lehmann
3fc1510dff [1.13] Update vendored swarmkit to 70cb786 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-10 12:55:35 -08:00
Vincent Demeester
340f288211 Merge pull request #29962 from vieux/1.13.0-rc6-cherrypicks 
1.13.0 rc6 cherrypicks
 2017-01-10 10:09:04 +01:00
Aaron Lehmann
831eeb38f1 [1.13] Update vendored swarmkit to 8ea08a3 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-09 11:45:04 -08:00
Sebastiaan van Stijn
46af2edec2 un-fork go-memdb 
commit 9322636c89
temporarily switched to a fork of go-memdb, because
a pull request that was needed was not yet merged
upstream.

this pull request was merged, so we can un-fork
this dependency.

this change does not bump the dependency, and
only un-forks. bumping the dependency should
be done in a separate change, if needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5f057f6350)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2017-01-09 06:37:40 -08:00
Aaron Lehmann
f2260228a7 vendor: Unfork logrus dependency 
Vendor the latest official logrus release instead of a custom fork
(which now happens to be identical to the fork).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 11df2db538)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2017-01-09 06:37:40 -08:00
Aaron Lehmann
eb5273edd4 [1.13] Revendor swarmkit to 7f910df 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-05 14:53:47 -08:00
Madhu Venugopal
15293063ba Vendoring libnetwork to bring in isbuiltin changes 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-01-03 15:37:47 -08:00
Derek McGowan
a55a9b14d1 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>
(cherry picked from commit 61ac7c4bf8)
 2016-12-27 13:30:44 -08:00
Aaron Lehmann
e460a5f45c Vendor swarmkit from bump_v1.13.0 branch 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-16 10:44:25 -08:00
Justin Cormack
45b441f4f9 Merge pull request #29395 from mavenugo/exp13 
Cherry-pick : Add the missing experimental ipvlan network driver
 2016-12-15 14:56:00 -08:00
Victor Vieux
1b521547f0 Merge pull request #29229 from vieux/1.13.0-rc4-cherrypicks 
1.13.0-rc4 cherry-picks: part1
 2016-12-14 17:18:17 -08:00
Madhu Venugopal
b7316e85c0 Vendor libnetwork with experimental daemon flag handling 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-12-14 00:54:57 -08:00
Santhosh Manohar
4b7bef26c5 Update libnetwork to 4df06c4 
This fixes docker #28931, #28172, #28969

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-12-12 11:40:14 -08:00
Yong Tang
30b458a28c [1.13.x] Update vendored swarmkit to b5f07ce49c66d2f5feee83998b23d4c905b78155 
This fix update swarmkit to b5f07ce49c66d2f5feee83998b23d4c905b78155

The following changes have been included:
- Fix missing IPAM options in swarm network mode (docker/swarmkit#1789)

The above PR is related to docker PR #29074 and docker issue #29044.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-12-10 04:02:22 -08:00
Derek McGowan
9ecbaa77ae Update vendor distribution 
Distribution client change for class in resource

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit d1f5e0f7a6)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-12-09 14:10:23 -08:00
Aaron Lehmann
aca0bdab13 Update vendored swarmkit to 999addf 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-07 17:59:31 -08:00