github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
10,590 Commits 3 Branches 2 Tags 112 MiB
af24e3871a
Commit Graph

10590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
ba9b075683
Merge pull request #740 from Random-Liu/improve-gce-bootstrap 
Improve gce bootstrapping in various ways.
 2018-04-18 14:12:27 -07:00
Lantao Liu
d1ba950abc Add log level support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 13:34:19 -07:00
Lantao Liu
72ade6c4f5 Remove 10-containerd-net.conflist from cri-containerd-cni release tarball. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 13:34:19 -07:00
Lantao Liu
b2ebb735e7 Improve gce bootstrapping in various ways. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 13:34:19 -07:00
Lantao Liu
daa9f6008c
Merge pull request #743 from Random-Liu/fix-sandbox-stop-race 
Fix sandbox stop race condition.
 2018-04-18 13:28:54 -07:00
Derek McGowan
0a978d0b82
Merge pull request #2296 from tophj-ibm/cleanup-loopback-devices 
testing: cleanup loopback devices on test skip
 2018-04-18 10:44:19 -07:00
Lantao Liu
856534c846 Fix sandbox stop race condition. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-18 10:12:33 -07:00
Christopher Jones
f1639bca4b
testing: cleanup loopback devices on test skip 
Fixes a case where loopback devices wouldn't get cleaned up
when a test was being skipped

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2018-04-18 12:39:21 -04:00
Phil Estes
e9114e3257
Merge pull request #2294 from fermayo/fix-cli-help 
ctr: fix --mount help message
 2018-04-18 08:29:06 -04:00
Lantao Liu
290eec8e34
Merge pull request #739 from Random-Liu/fix-hostnet-port-forward 
Fix portforward for host network.
 2018-04-17 21:39:17 -07:00
Lantao Liu
d970636147 Update CRI validation test to include hostnet portforward test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-17 19:19:03 -07:00
Fernando Mayo
0a26b0fe43 ctr: fix --mount help message 
Signed-off-by: Fernando Mayo <fermayo@gmail.com>
 2018-04-17 18:29:33 -07:00
Lantao Liu
c83a55d617
Merge pull request #734 from Random-Liu/update-containerd 
Update containerd.
 2018-04-17 10:01:48 -07:00
Lantao Liu
5cb4744f27 Fix portforward for host network. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-17 08:24:44 +00:00
Lantao Liu
19882b8028
Merge pull request #735 from mikebrow/track-golang-point-releases 
start tracking golang updates for 1.10.x
 2018-04-16 22:45:25 -07:00
Lantao Liu
b7af412106
Merge pull request #731 from Random-Liu/add-release-instruction 
Add release instruction to make the release process written down.
 2018-04-16 18:40:27 -07:00
Mike Brown
5f87a2a0d9 start tracking golang updates for 1.10.x 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-04-16 08:03:52 -05:00
Lantao Liu
9aa9f85a03 Add release instruction to make the release process written down. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-16 06:46:22 +00:00
Lantao Liu
da285a10b9 Update containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-16 06:25:21 +00:00
Derek McGowan
f630d5f0a6
Merge pull request #2292 from dmcgowan/prepare-1.1.0-rc.2 
Prepare 1.1.0-rc.2
 2018-04-13 16:04:05 -07:00
Derek McGowan
dc47f11963
Prepare 1.1.0-rc.2 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-13 15:36:05 -07:00
Phil Estes
35f0ff957d
Merge pull request #2291 from dmcgowan/release-dependencies-changelog 
Clean up dependency output
 2018-04-13 18:23:29 -04:00
Derek McGowan
764d764f09
Merge pull request #2286 from dmcgowan/multiple-snapshot-links 
gc: add support for multiple snapshot labels
 2018-04-13 15:15:21 -07:00
Derek McGowan
6c01529057
Clean up dependency output 
Show new tag when dependencies don't have a previous version.
Align dependencies into columns.
Sort dependencies by name.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-13 14:42:15 -07:00
Phil Estes
e03eafa102
Merge pull request #2290 from Random-Liu/update-cri-plugin 
Update `cri` plugin to v1.0.0-rc.2.
 2018-04-13 09:09:13 -04:00
Lantao Liu
6da553e112 Update cri plugin to v1.0.0-rc.2. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-13 07:01:48 +00:00
Derek McGowan
f5e3e67dad
gc: add support for multiple snapshot labels 
Allows linking to multiple snapshots within the same snapshotter.
Adds support for using slash to separate content as well for consistency.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-11 15:56:01 -07:00
Derek McGowan
7f053943ca
Merge pull request #2186 from stevvooe/update-grpc-110 
vendor: update grpc to 1.10.1
 2018-04-11 11:11:59 -07:00
Lantao Liu
77a33b10a9
Merge pull request #729 from Random-Liu/fix-portforward 
Add socat back.
 2018-04-10 23:08:57 -07:00
Lantao Liu
69b3f3aeac Add socat back. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-11 01:53:24 +00:00
Lantao Liu
b09489de96
Merge pull request #727 from Random-Liu/fix-symlink-layer 
Support symlink layer in image import.
 2018-04-10 18:32:29 -07:00
Lantao Liu
9f85c48e4c Support symlink layer in image import. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-10 22:08:45 +00:00
Lantao Liu
de0afd70ee
Merge pull request #728 from abhi/socat 
Minor cleanup of comment in ansible
 2018-04-09 16:34:38 -07:00
abhi
f7a0b43734 Minor cleanup of comment in ansible 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 15:57:24 -07:00
Lantao Liu
3d0706c4e5
Merge pull request #691 from abhi/socat 
Getting rid of nsenter and socat
 2018-04-09 15:34:44 -07:00
abhi
c200cb4642 Updating ansible installer 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 14:31:49 -07:00
Abhinandan Prativadi
1317854ec1 Updating travis.yml and Readme to remove nsenter and socal 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 14:31:49 -07:00
abhi
02b952ec17 Getting rid of socat 
Signed-off-by: abhi <abhi@docker.com>
 2018-04-09 14:31:44 -07:00
Michael Crosby
b1d2f1df1c
Merge pull request #2283 from crosbymichael/image 
Add NewImage to return a client Image impl
 2018-04-09 16:58:06 -04:00
Michael Crosby
d2c1b6a54e
Merge pull request #2282 from crosbymichael/close 
Only close if conn exists
 2018-04-09 16:33:44 -04:00
Lantao Liu
304045491c
Merge pull request #725 from Random-Liu/fix-resolver-race 
Fix resolver race
 2018-04-09 13:10:44 -07:00
Lantao Liu
2e693ad4f6
Merge pull request #724 from Random-Liu/add-cni-config-template 
Add cni config template
 2018-04-09 13:10:05 -07:00
Michael Crosby
367666091b Add NewImage to return a client Image impl 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-04-09 14:56:46 -04:00
Michael Crosby
c47cbe7b57 Only close if conn exists 
For internal services like cri, close will panic

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-04-09 14:54:34 -04:00
Lantao Liu
a68530c1e8 Port containerd fix #2276 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-09 18:36:06 +00:00
Lantao Liu
d8a3c5f254 Address comments. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-09 18:15:09 +00:00
Michael Crosby
9c238a64e9
Merge pull request #2281 from stevvooe/update-11-api 
api: update API capture for 1.1 release
 2018-04-09 10:58:38 -04:00
Lantao Liu
b2099c2061 Add cni config template support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-07 06:34:45 +00:00
Lantao Liu
68ef2c338e Update containerd to v1.1.0-rc.1 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-07 00:49:58 +00:00
Stephen J Day
b5cbe7b590
vendor: update grpc to 1.10.1 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-04-06 13:53:49 -07:00