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

9020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
9741f03932
Merge pull request #3648 from crosbymichael/man-bin 
Move manpage gen to separate binary
 2019-09-12 13:46:00 -07:00
Michael Crosby
5a656cacb4 Move manpage gen to separate binary 
This moves the man page generation to a separate binary

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-12 14:19:00 -04:00
Michael Crosby
9c77ec3c73
Merge pull request #3644 from Random-Liu/finish-cri-release 
Publish cri release to gs://cri-containerd-release.
 2019-09-12 09:38:05 -04:00
Lantao Liu
6ed809168e Publish cri release to gs://cri-containerd-release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-12 00:31:53 -07:00
Derek McGowan
1d484c28ea
Merge pull request #3643 from Random-Liu/skip-cleanup 
Skip cleanup in travis deploy and avoid gcs race condition.
 2019-09-11 18:05:34 -07:00
Lantao Liu
f997c30ec6 Skip cleanup in travis deploy and avoid gcs race condition. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-11 16:51:41 -07:00
Derek McGowan
2d4dc24154
Merge pull request #3641 from Random-Liu/add-encrypted-key 
Encrypt the secret file in containerd/containerd.
 2019-09-11 15:29:16 -07:00
Derek McGowan
36c543a726
Remove extra CI testing on older Ubuntu 
Testing the older LTS does not require testing the full matrix
to test for compatibility.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-11 13:47:48 -07:00
Derek McGowan
d3ccbc66ed
Merge pull request #3637 from crosbymichael/manpages 
Use updated urfave/cli to generate man pages
 2019-09-11 13:45:04 -07:00
Lantao Liu
4e8a49948c Encrypt the secret file in containerd/containerd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-11 13:24:54 -07:00
Michael Crosby
f3a5b8c0a9 Add command to generate man pages 
The climan package has a command that can be registered with any urfav
cli app to generate man pages.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-11 15:31:02 -04:00
Michael Crosby
d8ad1bdbb3
Merge pull request #3638 from Random-Liu/upload-gcs-cri-release 
Update gcs cri release.
 2019-09-11 15:05:41 -04:00
Lantao Liu
d1a12823b7 Update gcs cri release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-11 11:22:01 -07:00
Phil Estes
65a6d0a82f
Merge pull request #3639 from crosbymichael/go-runc 
Update go-runc to e029b79d8cda8374981c64eba71f28e
 2019-09-11 11:44:59 -04:00
Michael Crosby
424d33c5b7 Update go-runc to e029b79d8cda8374981c64eba71f28e 
Includes fix for user namespaces and NOTIFY_SOCKET.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-11 11:20:34 -04:00
Akihiro Suda
9dccbaa6ec
Merge pull request #3636 from dmcgowan/fix-cri-darwin-release 
[CI] fix darwin build for cri release
 2019-09-11 18:56:07 +09:00
Derek McGowan
3db5a5ad2e
Fix darwin build for cri release 
Split release target for cri

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-10 16:38:33 -07:00
Derek McGowan
5403e554e4
Merge pull request #3635 from Random-Liu/update-cri-tools 
Update cri test to fix image reference test.
 2019-09-10 10:26:45 -07:00
Mike Brown
738179542a add a test case for container_annotations 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-09-10 11:28:59 +03:00
Ed Bartosh
05a9028969 Use container annotations when creating containers 
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
 2019-09-10 11:28:59 +03:00
Ed Bartosh
e28689657a Add ContatinerAnnotations to the Runtime and config 
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
 2019-09-10 11:28:51 +03:00
Lantao Liu
1b4cec9796 Update cri test to fix image reference test and fix gcs deploy. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-09 23:51:36 -07:00
Derek McGowan
ce8d63255c
Merge pull request #3634 from Random-Liu/fix-cri-release 
Fix CRI release build.
 2019-09-09 19:07:34 -07:00
Lantao Liu
307e802aa5
Merge pull request #1271 from mikebrow/update-readme-goinstr 
need to move instr to more recent golang; remove integration/*.go from lint verify test
 2019-09-09 17:00:53 -07:00
Lantao Liu
e3abd03ae1 Fix CRI release build. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-09 16:09:25 -07:00
Derek McGowan
d4637128c3
Merge pull request #3629 from Random-Liu/automate-cri-tarbal-release 
Automate CRI tarball release.
 2019-09-09 14:56:16 -07:00
Mike Brown
da03c5bb9a remove integration files from lint verify 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-09-09 11:17:25 -07:00
Lantao Liu
61f113e608 Automate CRI tarball release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-09 10:48:52 -07:00
Mike Brown
02596d2758 need to move up to a more recent golang 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2019-09-09 09:59:29 -07:00
Michael Crosby
51671ef734
Merge pull request #3630 from AkihiroSuda/ctr-newdockerauthorized 
ctr: use NewDockerAuthorizer instead of deprecated NewAuthorizer
 2019-09-09 12:47:10 -04:00
Akihiro Suda
c1fc21e92e ctr: use NewDockerAuthorizer instead of deprecated NewAuthorizer 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-09-09 02:38:07 +09:00
Lantao Liu
6961bfa1d4
Merge pull request #1266 from Random-Liu/support-local-containerd 
Support local containerd release.
 2019-09-06 17:47:19 -07:00
Lantao Liu
763461f47f Support local containerd release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-06 16:26:14 -07:00
Phil Estes
61b127f3e3
Merge pull request #3628 from crosbymichael/ctr-env 
Add --env-file to ctr
 2019-09-06 16:55:21 -04:00
Michael Crosby
fa11147e5f Add --env-file to ctr 
Closes #3517

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-06 16:25:02 -04:00
Phil Estes
2ddfc6d2ed
Merge pull request #3625 from dmcgowan/1.3-update-mailmap 
Update and simplify mailmap
 2019-09-06 07:21:07 -04:00
Derek McGowan
672b86acf8
Merge pull request #3624 from tklauser/platforms-update 
platforms: update known OS and arch values
 2019-09-05 16:53:37 -07:00
Derek McGowan
5c576b0269
Update and simplify mailmap 
Add new contributors for 1.3.
Simplify mailmap by removing unnecessary commit names.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-05 15:42:36 -07:00
Michael Crosby
eaa24d6e40
Merge pull request #3621 from tanjunchen/modify-document-repeat-word 
modify-document-duplicate-word
 2019-09-05 11:21:01 -04:00
Michael Crosby
77abec43c4
Merge pull request #3623 from fuweid/me-sort-before-check 
config_test: sort result before check
 2019-09-05 09:06:17 -04:00
Tobias Klauser
c8cb864ce0 platforms: update known OS and arch values 
Update the lists in isKnownOS and isKnownOS according to goosList and
goarchList taken from Go 1.13, see
https://github.com/golang/go/blob/release-branch.go1.13/src/go/build/syslist.go

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2019-09-05 14:15:43 +02:00
Wei Fu
3d1fdacccf config_test: sort result before check 
config imports is in random order after LoadConfig call so that the
testing check should be done after sort.Strings(out.Imports).

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-09-05 16:30:28 +08:00
chentanjun
8788af7f8d modify-document-duplicate-word 
Signed-off-by: chentanjun <2799194073@qq.com>
 2019-09-05 09:10:19 +08:00
Derek McGowan
59a625defb
Merge pull request #3609 from Random-Liu/add-image-with-platform 
Make default platform configurable in the client
 2019-09-04 16:46:33 -07:00
Derek McGowan
d540b10c75
Merge pull request #3607 from awesomenix/updatecri 
Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6
 2019-09-04 13:42:29 -07:00
Michael Crosby
f76eefd272
Merge pull request #3574 from mxpv/cfg 
Support config imports
 2019-09-04 16:34:11 -04:00
Phil Estes
1eaf601453
Merge pull request #3616 from Random-Liu/fix-unpack-on-windows 
Support foreign and encrypted layers in the unpacker.
 2019-09-04 14:34:42 -04:00
Phil Estes
3050b36640
Merge pull request #3615 from dmcgowan/fix-proxy-plugin-config 
Fix proxy plugin config validation
 2019-09-04 10:09:24 -04:00
Lantao Liu
d6a6e0b8bc Support foreign and encrypted layers in the unpacker. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-03 18:43:10 -07:00
Derek McGowan
c7c7955757
Merge pull request #3614 from thaJeztah/travis_bionic_take2 
travis: fix Xenial tests not being run on master
 2019-09-03 17:42:40 -07:00