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

10590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
f5390d01d6 Fix a potential panic 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-22 03:17:16 +00:00
Lantao Liu
7f5687c801
Merge pull request #616 from Random-Liu/run-cri-in-parallel 
Update critools and run critest in parallel.
 2018-02-21 16:11:46 -08:00
Lantao Liu
8c41634bae
Merge pull request #615 from Random-Liu/use-containerd-cli 
Use containerd cli for CI
 2018-02-21 15:05:18 -08:00
Lantao Liu
fd32f5b8a5 Update critools and run critest in parallel. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-21 22:31:11 +00:00
Lantao Liu
cc2726054d Add test-containerd for plugin mode test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-21 22:21:48 +00:00
Derek McGowan
3b4fcf771a
Merge pull request #2112 from crosbymichael/temp-mounts 
Add temp mount location to manage temp mounts
 2018-02-21 12:56:23 -08:00
Derek McGowan
fc87dce767
Merge pull request #2149 from crosbymichael/reconnect 
Add client.Reconnect API
 2018-02-21 12:52:08 -08:00
Michael Crosby
7b653dc9ed Add client.Reconnect API 
This adds a reconnect api to the client so that the client instance
stays the same and on reconnect, all tasks and containers with
references to the *Client have the correct connection.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-21 11:18:02 -05:00
Michael Crosby
255ad41cfc
Merge pull request #2008 from thaJeztah/bump-golang-to-1.10 
Bump to Go 1.10
 2018-02-21 10:07:18 -05:00
Sebastiaan van Stijn
b17bcb7284
Regenerate protos with Go 1.10, and make check conditional 
Gofmt changed in Go 1.10, so regenerating with the new formatting.
From the Go 1.10 release notes: https://golang.org/doc/go1.10#gofmt

> Gofmt
> ... Second, single-method interface literals written on a single line,
> which are sometimes used in type assertions, are no longer split onto multiple lines.

The travis configuration was updated to skip `check-protos` on Go 1.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-21 10:51:43 +01:00
Sebastiaan van Stijn
931000c041
Bump to Go 1.10 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-21 10:50:05 +01:00
Kenfe-Mickaël Laventure
916cdb41a1
Merge pull request #2147 from darrenstahlmsft/RemoveServicing 
Removing Windows servicing containers
 2018-02-20 19:13:34 -08:00
Lantao Liu
45b6e75803 Update containerd to 129167132c. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-21 02:52:57 +00:00
Akihiro Suda
56ebee8368
Merge pull request #2146 from crosbymichael/pid-file 
Add --pid-file to `ctr`
 2018-02-21 11:39:45 +09:00
Darren Stahl
243467aa96 Removing Windows servicing containers 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2018-02-20 16:56:13 -08:00
Michael Crosby
d3a8055e2d Add --pid-file to ctr 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-20 15:10:50 -05:00
Michael Crosby
129167132c
Merge pull request #2108 from kunalkushwaha/license-header 
Licence header added
 2018-02-20 09:56:21 -05:00
Phil Estes
5a86e83d83
Merge pull request #2142 from seemethere/update_continuity 
Update continuity vendor to d8fb85
 2018-02-19 14:34:14 -05:00
Kunal Kushwaha
b12c3215a0 Licence header added 
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2018-02-19 10:32:26 +09:00
Eli Uriegas
735114f500 Update continuity vendor to d8fb85 
Includes a fix for 32bit systems

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2018-02-17 00:23:42 +00:00
Lantao Liu
fa91b905e9 Update vendors. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-16 23:23:47 +00:00
Lantao Liu
809a99a39e Vendor cri plugin and add critest 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-16 23:23:47 +00:00
Akihiro Suda
6a50dca196
Merge pull request #2141 from estesp/with-linuxns 
Add --with-ns flag to ctr run/create
 2018-02-17 06:01:40 +09:00
Phil Estes
e4e53bf486
Add --with-ns flag to ctr run/create 
Adds a useful flag to `ctr` to enable joining any existing Linux
namespaces for any namespace types (network, pid, ipc, etc.) using the
existing With helper in the oci package.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-02-16 15:23:04 -05:00
Michael Crosby
ea58933dbc
Merge pull request #2132 from tophj-ibm/lower-mkfs-size 
[testing] use smaller filesize on 4KB pagesize systems
 2018-02-16 11:42:11 -05:00
Kenfe-Mickaël Laventure
1392ad2b54
Merge pull request #2139 from estesp/godoc-typo 
Clean up client Subscribe docs; remove a typo
 2018-02-16 07:46:44 -08:00
Michael Crosby
849fed09e3
Merge pull request #2137 from tophj-ibm/bump-go-version 
[contrib] bump golang
 2018-02-16 10:29:34 -05:00
Christopher Jones
8043f26651
[contrib] bump golang 
Use golang:1.9, which should get the latest 1.9.x version,
instead of using a specific tag.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2018-02-16 08:23:35 -05:00
Phil Estes
18be82118d
Clean up client Subscribe docs; remove a typo 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-02-15 20:38:57 -05:00
Christopher Jones
6e3701141b
[testing] use smaller filesize on 4KB pagesize systems 
Use a smaller filesize on systems that have a default 4KB pagesize.

This is because mkfs.btrfs uses the default system pagesize as blocksize
when creating a device, so if the pagesize is larger, then the file needs
to be larger as well. This larger filesize is needed specifically for
systems where 64KB is default, such as ppc64le.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2018-02-15 15:33:46 -06:00
Michael Crosby
aa82d17d1d
Merge pull request #2079 from estesp/man-pages 
Add initial man pages
 2018-02-15 11:07:35 -05:00
Lantao Liu
454f583d49
Merge pull request #600 from mikebrow/cleanup-hack-versions 
removes hack versions; splits update vendor into optional sort and sync operations
 2018-02-14 16:42:55 -08:00
Mike Brown
84139b4241 removes hack versions; splits update vendor and makes it optional 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-02-14 16:37:49 -06:00
Lantao Liu
460eed77ef
Merge pull request #611 from Random-Liu/fix-shutdown 
Do not block on stream server close.
 2018-02-14 14:09:56 -08:00
Phil Estes
8f183b5ee9
Add basic manpages for ctr, containerd, containerd-config 
Adds initial manpages for ctr, containerd, and containerd config
commands, as well as the config.toml configuration file.

Adds targets to Makefile for generating and installing manpages.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-02-14 15:17:31 -05:00
Michael Crosby
b2ec177bb2 Call temp mounts and unmount in containerd server 
Fixes #2004

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-14 15:16:54 -05:00
Michael Crosby
bc974a7a32 Create temp mount location manager 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-02-14 15:14:02 -05:00
Lantao Liu
561d045d71
Merge pull request #612 from Random-Liu/health-monitor-initial-wait 
Add initial wait for health-monitor and use pkill -x.
 2018-02-14 11:36:45 -08:00
Phil Estes
002cabade8
Merge pull request #2131 from AkihiroSuda/split-pkg-cmd-containerd-2 
cmd/containerd: split package for cli.App
 2018-02-14 14:24:07 -05:00
Lantao Liu
9b2d2a203c Add initial wait for health-monitor and use pkill -x. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-14 18:51:22 +00:00
Akihiro Suda
d7280ce2fb cmd/containerd: split package for cli.App 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-02-14 17:44:22 +09:00
Lantao Liu
6d538ccbf6 Do not block on stream server close. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-14 08:41:29 +00:00
Lantao Liu
df461c0d48
Merge pull request #609 from Random-Liu/support-reopen-container-log 
Support reopening container log.
 2018-02-13 10:51:22 -08:00
Lantao Liu
a8264ec035 Support reopening container log. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-13 17:57:45 +00:00
Kenfe-Mickaël Laventure
af593cf5ab
Merge pull request #2130 from justincormack/environmnet 
Fix typo in variable name
 2018-02-13 07:23:22 -08:00
Justin Cormack
eab5d87af1 Fix typo in variable name 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2018-02-13 15:06:49 +00:00
Kenfe-Mickaël Laventure
dd920d99c8
Merge pull request #2125 from estesp/website-update 
Carry #1951: Website update
 2018-02-12 11:34:31 -08:00
Michael Crosby
efb813f18b
Merge pull request #2126 from dmcgowan/fix-2119 
archive/diff: fix consecutive directory removal bug
 2018-02-12 14:16:40 -05:00
Phil Estes
a929f9c746
Add further updates for website refresh 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-02-12 13:45:45 -05:00
Derek McGowan
ca3eb742fd
Update continuity vendor 
Picks up fix for consecutive directory deletion

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-02-12 10:45:15 -08:00