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

3550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kir Kolyshkin
9d0d4b806c context pkg: untangle 
Since Go 1.7, "context" is a standard package, superceding the
"x/net/context". Since Go 1.9, the latter only provides type aliases
from the former. Therefore, it makes sense to switch to the standard
package, and the change is not disruptive in any sense.

This commit deals with a few cases where both packages happened to be
imported by the same source file. A choice between "context" and
"gocontext" was made for each file in order to minimize the patch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-24 14:33:34 -07:00
Kir Kolyshkin
f337075620 Bump golang.org/x/net 
This version includes "x/net/context" which is fully compatible with
the standard Go "context" package, so the two can be mixed together.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-24 14:33:20 -07:00
Derek McGowan
209a7fc3e4
Merge pull request #2302 from dmcgowan/prepare-1.1 
Prepare 1.1.0 release
 2018-04-23 20:20:58 -07:00
Derek McGowan
1155371c7a
Prepare 1.1.0 release 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-23 18:29:33 -07:00
Derek McGowan
d8aef117f9
Merge pull request #2304 from Random-Liu/update-cri 
Update cri plugin to v1.0.0.
 2018-04-23 18:24:37 -07:00
Lantao Liu
9c9abec21c Update cri plugin to v1.0.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-23 16:34:17 -07:00
Michael Crosby
321c52a0bc
Merge pull request #2303 from juliengk/ctr_tasks_list 
Update ctr tasks list usage for quiet flag
 2018-04-23 15:39:26 -04:00
Julien Kassar
9d247718d7 Update ctr tasks list usage for quiet flag 
Signed-off-by: Julien Kassar <github@kassisol.com>
 2018-04-23 14:53:35 -04:00
Phil Estes
1381f8fddc
Merge pull request #2301 from HusterWan/zr/fix-misspell 
fix words misspell
 2018-04-23 08:32:00 -04:00
Michael Wan
7fd6d5e2be fix words misspell 
Signed-off-by: Michael Wan <zirenwan@gmail.com>
 2018-04-23 00:09:42 -04:00
Phil Estes
2ac13a8757
Merge pull request #2300 from dmcgowan/remove-content-helper-defers 
content: remove unnecessary defer in helpers
 2018-04-20 16:39:32 -04:00
Derek McGowan
3a6825e1a0
content: remove unnecessary defer in helpers 
Deferring the put back of the buffer is not necessary since
it can be done immediately after use, before checking error.
This decreases the amount of the time the buffer is out
of the pool and not in use.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-20 11:55:59 -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
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
Fernando Mayo
0a26b0fe43 ctr: fix --mount help message 
Signed-off-by: Fernando Mayo <fermayo@gmail.com>
 2018-04-17 18:29:33 -07: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
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
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
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
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
Stephen J Day
cf9986e865
api: update API capture for 1.1 release 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-04-06 13:52:10 -07:00
Stephen Day
076cf7f16e
Merge pull request #2278 from stevvooe/remove-google-rpc 
protobuf: remove generated google/rpc files
 2018-04-06 13:49:53 -07:00
Akihiro Suda
7610d9490e
Merge pull request #2279 from estesp/update-gover-travis 
Track Go 1.10 point releases in travis
 2018-04-06 12:30:21 +09:00
Derek McGowan
b28aa0e071
Merge pull request #2276 from stevvooe/protect-the-token 
[WIP] remotes/docker: protect secret with a mutex
 2018-04-05 16:28:44 -07:00
Stephen J Day
27a14f1a9d
remotes/docker: protect secret with a mutex 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-04-05 15:16:38 -07:00
Phil Estes
37765fbde5
Track Go 1.10 point releases in travis 
I assume we don't want to lock to Go 1.10.0.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-04-05 18:12:17 -04:00
Stephen J Day
caac3bca3e
protobuf: remove generated google/rpc files 
We move from having our own generated version of the googleapis files to
an upstream version that is present in gogo. As part of this, we update
the protobuf package to 1.0 and make some corrections for slight
differences in the generated code.

The impact of this change is very low.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-04-05 14:36:32 -07:00
Phil Estes
f1cea3fa7a
Merge pull request #2277 from crosbymichael/update-validation 
Allow image and snapshotkey to be updated
 2018-04-05 17:17:17 -04:00
Michael Crosby
9af8d56cdd Allow image and snapshotkey to be updated 
This allows a container's image and snapshot key to be updated via the
Update APIs.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-04-05 17:01:07 -04:00
Derek McGowan
2bc17ef2cb
Merge pull request #2275 from dmcgowan/prepare-1.1.0-rc.1 
Prepare 1.1.0-rc.1
 2018-04-04 17:14:10 -07:00
Derek McGowan
dabc22f47c
Prepare 1.1.0-rc.1 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-04 16:02:35 -07:00
Derek McGowan
49139695aa
Merge pull request #2274 from estesp/debug-travis 
Fix broken tests; make sure we don't mask travis script exit codes
 2018-04-04 13:24:59 -07:00
Phil Estes
b769cce904
Fix tests using invalid ID 
These tests are using their name as ID, but subtests add a forward slash
connected to the parent test, and slash (/) is an invalid character for
container IDs.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-04-04 15:32:02 -04:00
Michael Crosby
ad2548adb4
Merge pull request #2270 from Random-Liu/update-cri-plugin 
Update `cri` plugin to v1.0.0-rc.1.
 2018-04-04 15:19:01 -04:00
Phil Estes
45407846f3
Test whether use of exit is hiding errors 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-04-04 15:03:55 -04:00
Kenfe-Mickaël Laventure
9d9d1bc13c
Merge pull request #2269 from justincormack/WithPrivileged 
Add a WithPrivileged OCI constructor and the options needed to build it
 2018-04-04 11:37:29 -07:00
Phil Estes
6c02c5cf0a
Merge pull request #2272 from dmcgowan/fix-platform-pull-test 
client: fix multi-platform pull test
 2018-04-04 14:24:32 -04:00
Derek McGowan
9f3db59e0a
Update multiplatform pull test 
Remove architecture not included in image

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-04-04 10:49:41 -07:00
Justin Cormack
903191072e
Add --privileged option to ctr run 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2018-04-04 13:25:42 +01:00