vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity
1121 commits 2 branches 0 tags 33 MiB
Commit graph

1121 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aaron.L.Xu
a3cae915c3 fix some typos 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-21 15:02:36 +08:00
Akihiro Suda
5f6f04742c ctr: add --runtime-config 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-02-21 05:04:18 +00:00
Daniel, Dao Quang Minh
e0b1736aa4 Merge pull request #540 from samuelkarp/go18 
travis: Use 1.7.x and 1.8.x
 2017-02-20 18:09:45 +00:00
Kenfe-Mickaël Laventure
0644f51094 Merge pull request #538 from AkihiroSuda/nits 
multiple trivial fixes
 2017-02-20 10:04:48 -08:00
Samuel Karp
31166dc3e1 travis: Use 1.7.x and 1.8.x 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2017-02-20 09:59:53 -08:00
Daniel, Dao Quang Minh
a40ba05cf9 Merge pull request #537 from samuelkarp/go18 
travis: Add Go 1.8
 2017-02-20 17:31:48 +00:00
Akihiro Suda
2836fbeed1 ctr: fix Sprintf 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-02-20 05:28:09 +00:00
Akihiro Suda
40d966f00e clean up unused nats code 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-02-20 05:28:09 +00:00
Samuel Karp
713900ae15 travis: Add Go 1.8 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2017-02-19 19:21:38 -08:00
Michael Crosby
56460b93e4 Merge pull request #527 from hqhq/del_def_log_level 
Delete default log-level value
 2017-02-18 16:11:07 -08:00
Qiang Huang
d42dfcba23 Delete default log-level value 
It's duplicate with --log-level, and since --log-level
takes advantage of --debug and it has default value,
--debug never works now.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2017-02-18 21:14:58 +08:00
Stephen Day
54b804c601 Merge pull request #533 from stevvooe/simplify-btrfs-test-setup 
snapshot/btrfs: simplify test setup
 2017-02-17 17:24:55 -08:00
Stephen J Day
5922756d8b
snapshot/btrfs: simplify test setup 
After reviewing this closer, we removed a few buffers in favor
`(*exec.Command).Output` and simplified the loop file creation method to
just use `(*os.File).Truncate`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-02-17 16:53:11 -08:00
Stephen Day
ae5ebeb237 Merge pull request #502 from dmcgowan/diff-archive 
Add archive package
 2017-02-17 15:26:14 -08:00
Derek McGowan
3c94bf814e Add deletion test 
Test deleting multiple files, directories, and creating
the equivalent of an opaque directory.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-02-17 13:58:48 -08:00
Derek McGowan
6443891a7d Update log lines to use containerd log package 
Removed unused requires root test function and updated
tar requires function to use lookup method.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-02-17 11:50:49 -08:00
Derek McGowan
f0a43e72cd Update layer apply to use containerd archive 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-02-17 11:50:49 -08:00
Derek McGowan
0deba01621 Add archive package 
Archive package handles generating and applying diff tar streams
based on the OCI diff tar specification.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-02-17 11:49:58 -08:00
Michael Crosby
8fdccbf8e9 Merge pull request #531 from crosbymichael/shim-proto 
Change shim proto package
 2017-02-17 10:14:01 -08:00
Michael Crosby
5db3da6c2c Change shim proto package 
This is not really a service like the other rpcs that we expose so lets
change the import paths for it.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-17 09:55:22 -08:00
Stephen Day
61400c57ae Merge pull request #530 from dmcgowan/rootfs-prepare-update 
Update rootfs to use snapshot interface
 2017-02-16 12:40:18 -08:00
Derek McGowan
b399634320 Update rootfs to use snapshot interface 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-02-16 12:12:41 -08:00
Michael Crosby
8a4ad6e381 Merge pull request #526 from crosbymichael/no-bundles 
Remove concept of bundles from API
 2017-02-16 11:27:40 -08:00
Michael Crosby
47ececd6b8 Change Container interface to include Info 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-16 09:59:40 -08:00
Michael Crosby
c869eb0c61 Update vendored packages for changes 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-15 15:10:30 -08:00
Michael Crosby
ab8586b7c5 Remove bundles from API 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-15 13:56:41 -08:00
Michael Crosby
1dc5d652ac Merge pull request #525 from stevvooe/turn-off-gostring 
cmd/protoc-gen-gogoctrd: turn off GoString generation
 2017-02-15 13:53:51 -08:00
Stephen J Day
a3120172b0
cmd/protoc-gen-gogoctrd: turn off GoString generation 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-02-15 13:37:48 -08:00
Phil Estes
a891727e69 Merge pull request #524 from kevinetc123/patch-1 
Remove redundant code
 2017-02-15 15:47:12 -05:00
Stephen Day
f017f81210 Merge pull request #521 from stevvooe/protobuild 
cmd/ctrd-protobuild: create proper command for building protos
 2017-02-15 12:45:51 -08:00
Stephen J Day
83e7610194
cmd/ctrd-protobuild: create proper command for building protos 
After trying to explain the complexities of developing with protobuf, I
have now created a command that correctly calculates the import paths
for each package and runs the protobuf command.

The Makefile has been updated accordingly, expect we now no longer use
`go generate`. A new target `protos` has been defined. We alias the two,
for the lazy. We leave `go generate` in place for cases where we will
actually use `go generate`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-02-15 12:05:27 -08:00
Phil Estes
bee5135047 Merge pull request #519 from AkihiroSuda/log-shim2 
supervisor: print runtime's log on failure of ContainerCreate()
 2017-02-15 09:35:24 -05:00
kevinetc123
08f8270e2d remove redundant code 
Signed-off-by: kevinetc123 <kaiwentan@harmonycloud.cn>
 2017-02-15 20:43:17 +08:00
Akihiro Suda
34843af6a5 supervisor: print runtime's log on failure of ContainerCreate() 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-02-15 04:55:23 +00:00
Stephen Day
6bb8d5a589 Merge pull request #504 from AkihiroSuda/common-proto 
api: introduce api/{types, services} for deduplication of API definition
 2017-02-14 13:54:23 -08:00
Akihiro Suda
bf8abef70f api: introduce api/{types,services} for deduplication of API definition 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-02-14 02:42:13 +00:00
Michael Crosby
6527a57d7b Merge pull request #518 from crosbymichael/report 
Fix filename for 2-10 report
 2017-02-10 17:11:15 -08:00
Michael Crosby
915c464a9d Fix filename for 2-10 report 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-10 16:59:19 -08:00
Stephen Day
4a0c86cceb Merge pull request #516 from crosbymichael/report 
Add dev report for 2-10-2017
 2017-02-10 16:55:21 -08:00
Michael Crosby
a0fd5036c3 Add dev report for 2-10-2017 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-02-10 15:53:12 -08:00
Michael Crosby
89f62d4fae Merge pull request #515 from fate-grand-order/branch 
Use errors.New() directly to output the error message
 2017-02-10 13:55:10 -08:00
Phil Estes
43e42b4222 Merge pull request #503 from jmzwcn/master 
Allow specifying the log level
 2017-02-10 12:35:14 -08:00
Phil Estes
8617925271 Merge pull request #497 from kunalkushwaha/ctr-pprof 
pprof support through ``ctr`` added
 2017-02-10 12:20:24 -08:00
Michael Crosby
5c8b989305 Merge pull request #512 from stevvooe/return-of-the-mount 
api/types/mount: bring back the mount type
 2017-02-10 11:14:50 -08:00
Michael Crosby
f109ce26e0 Merge pull request #513 from fate-grand-order/branch-2 
fix some typos
 2017-02-10 11:12:23 -08:00
Daniel Zhang
ca52365780 Allow specifying the log level 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
 2017-02-10 17:29:06 +08:00
fate-grand-order
af86cd4d2f Use error.New () directly to output the error message 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
 2017-02-10 14:31:49 +08:00
Phil Estes
fc85c1de78 Merge pull request #514 from sakeven/master 
Fix copyFile error message
 2017-02-09 21:54:06 -08:00
sakeven
0e2822f892 fix copyFile error message 
Signed-off-by: sakeven <jc5930@sina.cn>
 2017-02-10 11:56:58 +08:00
fate-grand-order
8ce64b2000 fix some typos 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
 2017-02-10 10:52:25 +08:00