Commit Graph

4032 Commits

Author SHA1 Message Date
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
Justin Cormack
062c3a00ef
Add a WithPrivileged OCI constructor and the options needed to build it
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-04-04 13:25:34 +01:00
Lantao Liu
89d74986cc Update cri plugin to v1.0.0-rc.1.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 21:11:38 +00:00
Michael Crosby
d1b3ea4061
Merge pull request #2268 from justincormack/init-null-spec
Consistently add empty types where they are nil in spec
2018-04-03 10:42:07 -04:00
Phil Estes
417c923d65
Merge pull request #2266 from eirinikos/update-license
Edit Containerd license info so GitHub recognizes it
2018-04-03 10:21:19 -04:00
Justin Cormack
0ee2f35e43
Consistently add empty types where they are nil in spec
In a few places we check for nil types when modifying a spec,
but in many cases we do not so we could get a panic if the
passed in type was not filled. Because the generated spec is
filled we will not notice this but users may get unexpected
panics.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-04-03 14:44:23 +01:00
Stephen Day
8c2acf45fb
Merge pull request #2265 from stevvooe/lockdown-api
api: lock down api for 1.1 release
2018-04-02 14:21:16 -07:00
Andrea Kao
c0c92f6b34 Edit Containerd license info so GitHub recognizes it
GitHub uses a library called Licensee to identify a project's license
type. It shows this information in the status bar and via the API if it
can unambiguously identify the license.

This commit removes the LICENSE.docs file and updates the README to
refer readers directly to the CC-BY-4.0 license on the Creative Commons
site. It also updates the copyright reference to "The containerd
Authors" and removes a reference to copyright year in the LICENSE file
(per a recommendation from the CNCF).

This change allows Licensee to successfully identify the license
type of Containerd's codebase as Apache 2.0.

Signed-off-by: Andrea Kao <eirinikos@gmail.com>
2018-04-02 12:31:15 -07:00
Stephen J Day
ebd96a19d3
api: lock down api for 1.1 release
While there were no changes to the core API for the 1.1 release, we
still need to lock down the 1.1 version of the API to follow the
process.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-04-02 11:56:40 -07:00
Stephen Day
04efcc83a2
Merge pull request #2261 from AkihiroSuda/native-snapshotter
enable native (formerly naive) snapshotter by default
2018-04-02 11:33:25 -07:00
Akihiro Suda
83e35b3d3a enable native (formerly naive) snapshotter by default
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-04-02 13:29:19 +09:00
Stephen Day
bf5112e8ec
Merge pull request #2259 from Random-Liu/cleanup-with-user
Improve WithUser comments and code style.
2018-03-30 15:29:08 -07:00
Michael Crosby
1a9f9e65b9
Merge pull request #2258 from mlaventure/fix-stupid-typo
Fix typo in CreateUnixSocket error message
2018-03-30 16:44:34 -04:00
Lantao Liu
00b600a605 Improve WithUser comments and code style.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-30 20:34:12 +00:00
Michael Crosby
c0f7fcd910
Merge pull request #2257 from Random-Liu/add-with-user
Add oci.WithUser helper function.
2018-03-30 16:26:28 -04:00
Kenfe-Mickael Laventure
81feacd393
Fix typo in CreateUnixSocket error message
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2018-03-30 13:14:55 -07:00
Lantao Liu
45b0045593 Add oci.WithUser helper function.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-30 20:06:25 +00:00
Stephen Day
84a7b9c115
Merge pull request #2255 from mlaventure/unix-socket-toolong-error-msg
Return a better error message is unix socket path is too long.
2018-03-30 10:16:22 -07:00
Kenfe-Mickael Laventure
3c3a676490
Return a better error message is unix socket path is too long.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2018-03-30 09:00:02 -07:00