github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,778 Commits 3 Branches 2 Tags 112 MiB
498eebe860
Commit Graph

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
75e97dd168 Reverse the wrong logic for tty. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-07 02:03:44 +00:00
Lantao Liu
b9d4eda403
Merge pull request #401 from Random-Liu/add-comment 
Add comment for #398.
 2017-11-06 14:09:50 -08:00
Lantao Liu
68e74dc16a
Merge pull request #394 from Random-Liu/fix-container-streaming 
Various fixes for container streaming.
 2017-11-06 14:09:30 -08:00
Derek McGowan
8889d459af
Add directory permission tests 
Adds tests for verifying parent directory permissions.
Currently an issue exists in extracting into some Docker graph
drivers. Supporting these graph drivers may require changes to
the diff logic, these tests clarify the existing behavior and
that extraction within containerd works.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-06 13:50:04 -08:00
Lantao Liu
6f97764171 Add comment for #398. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 20:54:50 +00:00
Lantao Liu
eec818e6ab Various fixes for container streaming. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 20:50:50 +00:00
Lantao Liu
e363c218d6
Merge pull request #395 from Random-Liu/fix-image-in-container-status 
Return image tag as image spec.
 2017-11-06 10:55:37 -08:00
Lantao Liu
b6a1697c75
Merge pull request #396 from weiwei04/ansible 
replace deprecated ansible include cmd
 2017-11-06 10:37:56 -08:00
Lantao Liu
7c4c80befb
Merge pull request #398 from justincormack/remove-comment-read-only 
Remove comment about whether other paths should be read only with root
 2017-11-06 10:31:49 -08:00
Daniel, Dao Quang Minh
7e398dd591
Merge pull request #1717 from dnephin/use-gometalinter 
Use gometalinter for linting
 2017-11-06 16:11:46 +00:00
Michael Crosby
46ac2befcc
Merge pull request #1721 from bandoshintaro/master 
Fix docs, log output in getting started
 2017-11-06 10:35:48 -05:00
Phil Estes
8498de00bd
Merge pull request #1719 from AkihiroSuda/proc-scsi 
Add /proc/scsi to masked paths
 2017-11-06 09:44:16 -05:00
Justin Cormack
913836474b Remove comment about whether other paths should be read only with ro root 
Since https://github.com/moby/moby/pull/35344 we clarified that this behaviour
was a mistake, and the read only flag should just apply to the actual rootfs,
so it corresponds to the OCI read-only option. Other mounts may be able to be
adjusted by re-specifying them or other means but this is unrelated.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-11-06 14:21:16 +00:00
yanxuean
6234337459 Add truncindex for filter in List and Stat 
fix #344
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-06 16:47:43 +08:00
Wei Wei
53a4f93967 replace deprecated ansible include cmd 
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
 2017-11-06 15:06:46 +08:00
Lantao Liu
4a4a860dfa
Merge pull request #392 from Random-Liu/add-crictl-config 
Add crictl config.
 2017-11-05 22:14:21 -08:00
Lantao Liu
050ee1de95 Return image tag as image spec. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 06:05:49 +00:00
Lantao Liu
74abfe349d Add crictl config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 05:28:58 +00:00
bando-shintaro
5128f034b8 Fix docs, log output in getting started 
Signed-off-by: bando-shintaro <bando142141@gmail.com>
 2017-11-05 23:25:27 +09:00
Akihiro Suda
db589884ee Add /proc/scsi to masked paths 
Port over https://github.com/moby/moby/pull/35399

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-11-04 17:34:28 +00:00
Daniel Nephin
f9e969bac8 Use gometalinter for linting 
gometalinter runs linters in parallel for faster linting
it provides a uniform way of whitelisting lines using // nolint or the exclude
field in the config

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-03 18:02:27 -04:00
Lantao Liu
8a1a2f2713
Merge pull request #390 from miaoyq/update-hack-version 
Update 'hack/versions'
 2017-11-03 10:22:10 -07:00
Kenfe-Mickaël Laventure
ab67fd50dc
Merge pull request #1715 from thaJeztah/nit-fix-printf 
Align version output and minor code cleanup
 2017-11-03 10:08:57 -07:00
Sebastiaan van Stijn
65d5b8b937
Align version output and minor code cleanup 
This patch changes the output of `ctr version` to align version and revision.
It also changes `.Printf()` to `.Println()`, to make the code slightly easier
to read.

Before this change:

    $ ctr version
    Client:
      Version: v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

    Server:
      Version: v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

With this patch applied:

    $ ctr version
    Client:
      Version:  v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

    Server:
      Version:  v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-11-03 17:49:23 +01:00
Michael Crosby
a045575998 Strip binaries in Makefile 
This will make the binaries around 8MB smaller.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-11-03 11:44:41 -04:00
Yanqiang Miao
e79bf15dee Update 'hack/versions' and some Kubernetes repo 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 15:51:14 +08:00
Lantao Liu
9f2de2cd02
Merge pull request #382 from miaoyq/return-config 
"Status" function return cri-containerd config in json format
 2017-11-02 20:41:31 -07:00
Lantao Liu
e19e043a4c
Merge pull request #386 from Random-Liu/fix-spammy-cni-log 
Get rid of spammy CNI log.
 2017-11-02 20:40:50 -07:00
Yanqiang Miao
9b71208be9 "Status" function return cri-containerd config in json format 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 09:23:05 +08:00
Yanqiang Miao
72446e7e25 Update k8s to #53965 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 09:14:58 +08:00
Mike Brown
3e65b00310
Merge pull request #388 from Random-Liu/cleanup-load 
Cleanup image load code a bit.
 2017-11-02 20:10:09 -05:00
Lantao Liu
73c2cb5632 Fix spammy CNI log. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-03 01:08:07 +00:00
Stephen Day
99595e0b84
Merge pull request #1714 from dnephin/remove-deadcode-from-release 
Remove deadcode from cmd/containerd-release
 2017-11-02 16:57:16 -07:00
Lantao Liu
3312c2f560
Merge pull request #387 from Random-Liu/fix-node-e2e-test 
Fix our node e2e test.
 2017-11-02 16:37:31 -07:00
Lantao Liu
a77ba6b84b Cleanup image load code. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 23:09:43 +00:00
Lantao Liu
c2796dfab3
Merge pull request #384 from Random-Liu/update-containerd 
Update containerd to 564600ee79.
 2017-11-02 15:59:50 -07:00
Lantao Liu
69c16929e3 Fix our node e2e test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 22:50:27 +00:00
Mike Brown
df6f4a3655 adds help for load command (#383) 
* adds help for load command

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* vendor restrom/dedent

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-11-02 15:38:24 -07:00
Lantao Liu
1d61b7464b Update containerd to 564600ee79. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 22:17:38 +00:00
Lantao Liu
4fa0975f9d
Add e2e test. (#353) 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 15:06:44 -07:00
Daniel Nephin
393e8cc332 Remove deadcode from cmd/containerd-release 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-11-02 17:45:41 -04:00
Derek McGowan
5acf187697
Merge pull request #1712 from stevvooe/defaults-package 
defaults: add package to contain server defaults
 2017-11-02 14:11:02 -07:00
Stephen J Day
0a1a13448b
defaults: add package to contain server defaults 
To reduce the binary size of containerd, we no longer import the
`server` package for only a few defaults. This reduces the size of `ctr`
by 2MB. There are probably other gains elsewhere.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-11-02 13:59:34 -07:00
Zhenhao Zhang
0c1839047c add pprof endpoint (#370) 
Add pprof endpoint

Signed-off-by: zhangzhenhao <zhangzhenhao@outlook.com>
 2017-11-02 11:41:37 -07:00
Michael Crosby
564600ee79
Merge pull request #1707 from dmcgowan/snapshot-storage-db 
Open snapshot database only once
 2017-11-02 13:45:36 -04:00
Derek McGowan
68d3c77eae
Open snapshot database only once 
Prevents having multiple database connections open to a connection,
preventing bugs with locking by relying on the boltdb database
object to handle synchronization rather than file locking.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-11-02 10:32:13 -07:00
Kenfe-Mickaël Laventure
7a91c66d25
Merge pull request #1710 from AkihiroSuda/print-revision 
containerd --version: print version.Revision
 2017-11-02 07:56:41 -07:00
Akihiro Suda
dfdcd4decb containerd --version: print version.Revision 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-11-02 07:56:17 +00:00
Lantao Liu
1117430076
Merge pull request #377 from spiffxp/assignees-to-approvers 
Rename OWNERS assignees: to approvers:
 2017-11-01 23:50:48 +01:00
Lantao Liu
8679d10733
Merge pull request #380 from Random-Liu/fix-deadlock 
Do not call `Usage` inside `Walk`.
 2017-11-01 22:04:10 +01:00