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

2018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Day
f5bd8bbba3 Merge pull request #1243 from crosbymichael/reg-diff-urls 
Panic when registering the same type but diff urls
 2017-07-24 14:58:36 -07:00
Michael Crosby
a3769f887b Panic when registering the same type but diff urls 
Panic on typeurl registration when you register the same type but
different urls for that type.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-07-24 15:51:09 -04:00
Phil Estes
c52523c4d3 Merge pull request #1238 from crosbymichael/reg-specs 
Register spec types in client
 2017-07-24 14:49:09 -04:00
Stephen Day
f98b29792a Merge pull request #1239 from crosbymichael/roadmap 
Replace roadmap with link to milestones
 2017-07-24 11:34:14 -07:00
Stephen Day
ba577f7115 Merge pull request #1227 from tossmilestone/fix-comment-typo 
Fix typo error in Protobuild.toml
 2017-07-24 10:51:51 -07:00
Michael Crosby
becf001552 Replace roadmap with link to milestones 
Closes #1193

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-07-24 13:42:35 -04:00
Michael Crosby
b7e0101b37 Merge pull request #1228 from dmcgowan/content-testsuite 
content: test suite
 2017-07-24 13:36:50 -04:00
Michael Crosby
228f7d452c Register spec types in client 
Allow types to be registred multiple times instead of panic.

Fixes #1235

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-07-24 13:30:37 -04:00
Derek McGowan
8e1591bd8b
Call upload status tests 
Fix metadata status not returning correct reference string

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-07-24 10:11:35 -07:00
Derek McGowan
bb3c9c5927
Rename content/fs to content/local 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-07-24 10:11:35 -07:00
Derek McGowan
938f3185bd
Add content test suite 
Add content test suite with test for writer.
Update fs and metadata implementations to use test suite.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-07-24 10:11:34 -07:00
Derek McGowan
442365248b
Move content store implementation 
Move the filesystem content store implementation to a
subpackage of content.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-07-24 10:11:34 -07:00
Phil Estes
9b53b8b68d Merge pull request #1237 from WeiZhang555/remove-hardcoded-str 
Replace hardcoded debug address with const var
 2017-07-24 13:10:21 -04:00
Zhang Wei
adeec483a3 Replace hardcoded debug address with const var 
Debug address in defaultConfig() doesn't have to be a hardcoded string,
instead it can be const var from package server, which is also a
platform dependent const. So it would be better to use
server.DefaultDebugAddress here.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2017-07-24 23:41:39 +08:00
He Xiaoxi
856c351fac Improve the comment 
Signed-off-by: He Xiaoxi <tossmilestone@gmail.com>
 2017-07-22 12:39:34 +08:00
Stephen Day
4118a256e9 Merge pull request #1234 from dmcgowan/update-logrus 
update to github.com/sirupsen/logrus v1.0.0 [carry #1136]
 2017-07-21 16:26:24 -07:00
Derek McGowan
1491293260
Update dependencies for logrus rename 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-07-21 16:14:03 -07:00
Andrew Pennebaker
1d2a079f08
update to github.com/sirupsen/logrus v1.0.0 
Signed-off-by: Andrew Pennebaker <apennebaker@datapipe.com>
 2017-07-21 15:39:14 -07:00
Stephen Day
dd7642fc1c Merge pull request #1196 from mlaventure/update-windows-runtime 
Update windows runtime
 2017-07-21 15:12:53 -07:00
Phil Estes
a2df6d1adc Merge pull request #1141 from ijc/rootfsPropagation 
containerd-shim: Do not remount root MS_SLAVE
 2017-07-21 16:18:41 -04:00
Derek McGowan
0f6959a2fc Merge pull request #1160 from darkowlzz/1082-snapshot-commit 
cmd/ctr: add commit command to snapshot
 2017-07-21 10:58:57 -07:00
Derek McGowan
a621185855 Merge pull request #1179 from AkihiroSuda/makefile-i 
Makefile: `go build -i` -> `go build`
 2017-07-21 10:02:22 -07:00
Kenfe-Mickael Laventure
aeab935572
Fix vet errors 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
eb4e0b5fb1
Add AppVeyor configuration 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
e3fcde6934
Fix deadlock in events service 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
5ea5fbdfc5
Fix deadlock in TestContainerExec if process.Wait() fails 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
d4e780d71f
Ensure tasks are started when running tests 
This is needed on Windows since no process is actually running until
`Start()` is called, meaning no other operation by `Delete()` would
succeed.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
3df07cbc88
Cancel io if task is deleted without being started 
This prevent a deadlock on Windows since no process is actually running
until `Start()` is called.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
8e12d1fcad
ctr: Allow deleting a container in the Created state 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
4d14bfd8ad
go-winio: Don't increment the wait count if the file is closing 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
7f786cf075
go-winio: Prevent Data Race when accessing closing 
The race usually happens when `closeHandle()` and `prepareIo()` are called
concurrently; the former tries to set `closing` to `true` the latter tries
to read its value.

In order to avoid this issue, we added a lock around the variable.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
db1b0a2a5a
Update go-winio to v0.4.3 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
651aaff74e
Update integration test to support windows 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
79d04ded4e
Make integration a bit more verbose 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
b2d9db2e17
windows: Use runtime event topic constants 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
5c8e0efb63
windows: Add servicing code 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
4bb9ac2828
Sort ctr commands alphabetically 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
d0166c42ce
Register content command with ctr 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
d10c62d485
Wrap typeurl returned errors with the provided url/type 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
5fd004a1c0
Update vendoring 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
546f045128
Update errdefs.ErrInvalidArgument message 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
674b460d5a
Move typeurl registrations to runtime package 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:51 +02:00
Kenfe-Mickael Laventure
a4aaa09ccc
Update ctr so it works again on windows 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-21 18:19:48 +02:00
Kenfe-Mickael Laventure
61fbd2311c
windows: Refactor whole code 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-20 18:39:46 +02:00
Kenfe-Mickael Laventure
fc82e149ba
windows: Move runtime options out of the spec field 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-20 17:22:59 +02:00
Kenfe-Mickael Laventure
acf863a04e
windows: Rely on the OCI specs instead of custom type 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-20 17:22:59 +02:00
Kenfe-Mickael Laventure
bff040d087
windows: Ensure pids are not reused if active 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-20 17:22:59 +02:00
Ian Campbell
d42cb88ba2 Loop umount'ing rootfs until there are no more mounts 
This is simpler than trying to count how many successful mounts we made.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-07-20 10:50:08 +01:00
Ian Campbell
d63d2ecf6c Simplify mount cleanup on failure by using defer 
This avoids someone adding a new error path and forgetting to call the cleanup
function.

We prefer to use an explicit flag to gate the clean rather than relying on `err
!= nil` so we don't have to rely on people never accidentally shadowing the
`err` as seen by the closure.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-07-20 10:50:08 +01:00
Ian Campbell
300f083127 Cleanup mounts if we fail to mount one element of rootfs 
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-07-20 10:50:08 +01:00