github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,956 Commits 3 Branches 2 Tags 112 MiB
13bd93847d
Commit Graph

11956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
abhi
aeef99a76e Using netns to perform socat 
This commit removes the usage of nsenter and uses netns
to perform socat operation.

Signed-off-by: abhi <abhi@docker.com>
 2018-04-05 13:28:00 -07: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
c0f483adcf
Merge pull request #719 from qiujian16/qj_update_reademe 
Update readme on how to configure cri plugin
 2018-04-03 19:12:31 -07:00
Jian Qiu
8a7cd184dd Update README to add link on cri configuration 
Signed-off-by: Qiu Jian <qiujian@cn.ibm.com>
 2018-04-04 09:25:26 +08: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
Lantao Liu
9049463568
Merge pull request #720 from Random-Liu/update-containerd-before-release 
Update containerd once before release.
 2018-04-03 13:32:22 -07:00
Lantao Liu
55c54d118d Update containerd once before release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-03 18:25:51 +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
Lantao Liu
2bc72b6e0c
Merge pull request #717 from Random-Liu/enable-tls-streaming 
Enable TLS streaming in all the setup.
 2018-04-02 19:38:44 -07:00
Lantao Liu
ad7bffc093 Enable TLS streaming in all the setup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-04-03 00:17:26 +00:00
Lantao Liu
6e13a4dd52
Merge pull request #713 from mikebrow/use-self-certified-ca 
switches from not CA signed to self CA signed for streaming TLS
 2018-04-02 17:00:25 -07:00
Lantao Liu
facb6082f7
Merge pull request #716 from Random-Liu/update-cri-test 
Update cri test to include RunAsGroup test.
 2018-04-02 15:54:27 -07:00
Lantao Liu
839f9c3253
Merge pull request #715 from Random-Liu/upgrade-ansible 
Upgrade the tarball version in ansible.
 2018-04-02 15:54:13 -07:00