github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
2,329 Commits 3 Branches 4 Tags
c23f29ebce71cb10d6fa17ec48bfac6983b941e5
Commit Graph

2329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenfe-Mickael Laventure
c23f29ebce containerd-shim: Don't try to delete container twice 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
eb4abac9f7 linux: Prevent deadlock in reaper.WaitPid() 
A deadlock can occurs if `WaitPid()` is called twice before the process
dies.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Kenfe-Mickael Laventure
9923a49e97 linux/shim: Kill container upon SIG{TERM,KILL} 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-29 08:27:44 -07:00
Michael Crosby
6ec92ddbc9 Merge pull request #1437 from darrenstahlmsft/LCOWConfig 
LCOW: Split Windows and Linux HCS config generation
 2017-08-29 10:28:00 -04:00
Darren Stahl
d0b613665a Split Windows config generation to support LCOW 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-08-28 18:05:55 -07:00
Darren Stahl
4a782f7b54 Vendor opengcs and hcsshim 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-08-28 15:07:51 -07:00
Michael Crosby
cf09e32618 Merge pull request #1435 from Random-Liu/with-process-kill-all 
WithProcessKill should kill all processes.
 2017-08-28 14:49:18 -04:00
Lantao Liu
2f237b2fde WithProcessKill should kill all processes. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-28 18:39:00 +00:00
Kenfe-Mickaël Laventure
31b5bb9107 Merge pull request #1434 from crosbymichael/kill-all 
Add KillOpts for killing all processes
 2017-08-28 11:07:12 -07:00
Michael Crosby
ed6b8fb0aa Add KillOpts for killing all processes 
Fixes #1431

This adds KillOpts so that a client can specify when they want to kill a
single process or all the processes inside a container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-28 13:29:47 -04:00
Michael Crosby
a19761874e Merge pull request #1428 from mlaventure/go1.9 
Use golang 1.9 on CI
 2017-08-28 10:56:28 -04:00
Michael Crosby
b9879d46f4 Merge pull request #1433 from Random-Liu/fix-with-user-id 
WithUserID should not return error when /etc/passwd doesn't exist.
 2017-08-28 10:10:41 -04:00
Lantao Liu
410bcea236 WithUserID should not return error when /etc/passwd doesn't exist. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-28 05:57:49 +00:00
Michael Crosby
360e46ddda Merge pull request #1429 from dmcgowan/client-use-root-path 
Use RootPath for resolving path inside of an image
 2017-08-25 16:23:28 -04:00
Derek McGowan
44e266b7a7 Use RootPath for resolving path inside of an image 
Prevents unintentional lookup of host passwd file

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-25 13:16:46 -07:00
Michael Crosby
e4a77fcc0a Merge pull request #1425 from Random-Liu/add-with-user-id 
Add WithUserID which gets uid and gid from image's /etc/passwd.
 2017-08-25 16:00:49 -04:00
Lantao Liu
bb9e2bfa43 Add WithUserID which gets uid and gid from image's /etc/passwd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-08-25 19:52:48 +00:00
Derek McGowan
ab1968d590 Merge pull request #1427 from crosbymichael/states 
Add procesStates for shim processes
 2017-08-25 12:03:27 -07:00
Derek McGowan
fb427da12f Merge pull request #1424 from crosbymichael/load-exec 
Add LoadProcess api to Task
 2017-08-25 11:50:56 -07:00
Derek McGowan
1a77db1a2a Merge pull request #1423 from crosbymichael/events 
Add Events client method
 2017-08-25 11:45:55 -07:00
Michael Crosby
967497097a Add procesStates for shim processes 
Use the state pattern to handle process transitions from one state to
another and what actions can be performed on a process in a specific
state.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-25 14:03:55 -04:00
Kenfe-Mickael Laventure
34c25e07e8 Use golang 1.9 on AppVeyor CI 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-25 08:58:40 -07:00
Kenfe-Mickael Laventure
77b98f0590 Use golang 1.9 on Travis CI 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-25 08:34:04 -07:00
Michael Crosby
b3303b55c1 Add LoadProcess api to Task 
Fixes #1374

This adds a `LoadProcess` api to load existing exec'd processes from a
task.  It allows reattaching of IO and waiting on the process.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 16:30:34 -04:00
Kenfe-Mickaël Laventure
a6ce1ef2a1 Merge pull request #1413 from crosbymichael/user-opts 
Implement WithUsername for /etc/passwd lookup
 2017-08-24 11:49:23 -07:00
Michael Crosby
2052b76fa7 Change WithSpec to take SpecOpts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 14:32:41 -04:00
Michael Crosby
421c607c54 Add Events client method 
Fixes #1381

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 11:10:01 -04:00
Michael Crosby
5c7f67186a Add libcontainer/user package for passwd parsing 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 10:32:16 -04:00
Michael Crosby
f66f0fb7a0 Update windows SpecOpts in tests 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 10:32:16 -04:00
Michael Crosby
f436f4c828 Add WithUsername spec opt 
This option will mount and inspect the /etc/passwd file of an image to
get the uid/gid of a user.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 10:32:16 -04:00
Michael Crosby
c601606f84 Move spec generation to Container Create 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 10:32:16 -04:00
Michael Crosby
fa14f2ef3a Add context and client to SpecOpts 
In order to do more advanced spec generation with images, snapshots,
etc, we need to inject the context and client into the spec generation
code.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 10:32:16 -04:00
Michael Crosby
ba69f5d488 Add WithUserIDs SpecOpt 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-08-24 10:32:16 -04:00
Derek McGowan
f05281743e Merge pull request #1420 from dmcgowan/alpha6 
release: updated version to alpha6
 2017-08-23 15:36:13 -07:00
Derek McGowan
b14c2cce11 release: updated version to alpha6 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-23 15:09:32 -07:00
Michael Crosby
709c37b1d1 Merge pull request #1419 from dmcgowan/walk-skip-not-found 
Skip items removed during walk
 2017-08-23 17:59:31 -04:00
Kenfe-Mickaël Laventure
0daa593b3a Merge pull request #1393 from dmcgowan/multiple-differs 
Add support for multiple differs
 2017-08-23 14:45:17 -07:00
Derek McGowan
98960f0493 Skip items removed during walk 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-23 14:43:56 -07:00
Derek McGowan
05cdc4f435 Merge pull request #1417 from mlaventure/delete-exitedat 
go-client: Return an ExitStatus struct when calling process.Delete()
 2017-08-23 13:27:24 -07:00
Kenfe-Mickael Laventure
7f6c487031 go-client: Return an ExitStatus struct when calling process.Delete() 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-23 10:32:51 -07:00
Phil Estes
12b43a5c8a Merge pull request #1416 from tophj-ibm/fix-race-testflags 
Only use race flag on amd64
 2017-08-23 12:43:05 -04:00
Christopher Jones
e6ab556f0e Only use race flag on amd64 
Race is only supported on amd64, so only run if GOARCH is amd64

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2017-08-23 12:30:44 -04:00
Kenfe-Mickaël Laventure
60fea11686 Merge pull request #1400 from dmcgowan/content-local-writer-locks 
Ensure content writer only unlocks resource once
 2017-08-23 08:07:18 -07:00
Michael Crosby
311ea33608 Merge pull request #1414 from dmcgowan/btrfs-test-fail-2 
More snapshot and btrfs test cleanup
 2017-08-23 09:44:05 -04:00
Michael Crosby
3bcb6f835b Merge pull request #1415 from kunalkushwaha/minor-fmt-fix 
removing unused "fmt" package from import
 2017-08-23 09:25:47 -04:00
Kunal Kushwaha
8f7086a8bd unused fmt package 
`make integration` reports this error.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-08-23 15:29:30 +09:00
Derek McGowan
96a75ab1ab Move detach flags to platform specific 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-22 17:20:25 -07:00
Derek McGowan
f74cea71dd Update basic test to allow being run in parallel on client 
The basic test does an assert on the existing snapshots.
Update the check just to assert the expected snapshots were
found during the walk.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-22 17:14:06 -07:00
Derek McGowan
750771f6d0 Remove snapshot test suite as a parallel test runner 
The testsuite alters global state by setting the umask, avoid
running the testsuite in parallel and move umask manipulation
to the test suite level to individual tests may run in parallel.

Added better error messaging and handling.

Removed reliance on testing object for handling cleanup failure.
When a cleanup error occurred, it would fail the test but the log
would get skipped. With this change the failure will show up for
the running test.

Update test unmounting to set the detach flag, avoiding races with
btrfs which may see the device as busy when attempting to unmount.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-22 16:29:17 -07:00
Derek McGowan
502734116d Update loopback to return error 
Avoid calling testing function in creation closure since the
context may no longer be valid.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-08-22 16:09:38 -07:00