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

1881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
bd25543f5a Merge pull request #1109 from AkihiroSuda/fix-test 
container_test.go: fix compilation failure
 2017-06-28 10:11:46 -04:00
Akihiro Suda
3d981335e3 container_test.go: fix compilation failure 
# github.com/containerd/containerd
  ./container_test.go:769: cannot use &limit (type *uint64) as type *int64 in field value
  ./container_test.go:812: cannot use &limit (type *uint64) as type *int64 in field value

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-06-28 04:43:01 +00:00
Derek McGowan
a5fa3bb923 Merge pull request #1100 from crosbymichael/update-task 
Implement task update
 2017-06-27 14:39:45 -07:00
Stephen Day
7d6e40ef8b Merge pull request #1106 from crosbymichael/updates 
Update dependencies and add namespace to container metrics
 2017-06-27 14:34:31 -07:00
Michael Crosby
cfcea71ab0 Update windows and darwin for spec changes 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-27 13:20:55 -07:00
Michael Crosby
6ec84ef83c Add namespace to container metrics 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-27 11:54:14 -07:00
Michael Crosby
85f61f6f51 Move cgroups prom to containerd metrics 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-27 11:45:05 -07:00
Michael Crosby
49f9dc494f Update runc and runtime-spec dependencies 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-27 11:44:38 -07:00
Michael Crosby
f3b85a91b0 Merge pull request #1101 from estesp/invalid-runtime-command 
Fix incorrect reference to the gRPC runtime name as a binary
 2017-06-26 16:59:18 -07:00
Phil Estes
79e6a93624
Fix incorrect reference to the gRPC runtime name as a binary 
Until we have a way to preserve the initial command used to start the
container, we have to default to the default `runc` found on the $PATH.
This code after the last refactor of shim/API is incorrectly using the
gRPC object reference of the v1 runtime as a binary name which causes
os.Exec() errors.

Signed-off-by: Phil Estes <estesp@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2017-06-26 19:49:09 -04:00
Michael Crosby
f36e0193a4 Implement task update 
This allows tasks to have their resources updated as they are running.

Fixes #1067

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-26 16:38:49 -07:00
Michael Crosby
1f478be14d Merge pull request #1099 from dmcgowan/fix-ctr-delete-snapshot 
Fix ctr delete to remove snapshot
 2017-06-26 14:37:31 -07:00
Derek McGowan
fe91b9c5cf Merge pull request #1096 from crosbymichael/connect-opts 
Add NewWithGRPCOpts to specify grpc dial opts
 2017-06-26 13:54:30 -07:00
Derek McGowan
7f9910d04e
Fix ctr delete to remove snapshot 
Fix the behavior of removing snapshot on container delete.
Adds a flag to keep the snapshot if desired.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-26 13:38:08 -07:00
Michael Crosby
31322f9fbb Merge pull request #1097 from dmcgowan/fix-dev-report 
Fix sublist in dev report
 2017-06-26 12:46:53 -07:00
Derek McGowan
21b0f1e285
Fix sublist in dev report 
Also clean up some typos

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-26 10:58:05 -07:00
Michael Crosby
a962ac9909 Merge pull request #1090 from kunalkushwaha/runtime-name-fix 
Runtime name printed correctly for containers listing.
 2017-06-26 10:34:43 -07:00
Michael Crosby
3508e135e6 Add NewWithGRPCOpts to specify grpc dial opts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-26 10:31:23 -07:00
Michael Crosby
e2b5ef5f3d Merge pull request #1085 from dmcgowan/dev-report-6-23-2017 
Add dev report for June 23, 2017
 2017-06-26 09:54:50 -07:00
Kunal Kushwaha
16b10bb55d Runtime name printed correctly. 
Runtime is not printed while container listing due to typo introduced
in #935.
This fixes the Typo.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2017-06-26 11:46:32 +09:00
Michael Crosby
65f171a39f Merge pull request #993 from mlaventure/abstract-namespace 
containerd-shim: Use abstract namespace for shim socket
 2017-06-25 11:39:00 -07:00
Kenfe-Mickaël Laventure
cd7bbf2afe Merge pull request #1083 from stevvooe/common-identifiers 
identifiers: use common package for identifier validation
 2017-06-23 18:29:01 -07:00
Kenfe-Mickael Laventure
de632b1084
ctr: add remove subcommand to snapshot 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 18:24:46 -07:00
Kenfe-Mickael Laventure
5a02ae929c
ctr: Properly delete snapshot if run is called with --rm 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 18:01:01 -07:00
Kenfe-Mickael Laventure
6574055dec
linux: Pass correct type when emitting RuntimeDelete event 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 17:55:23 -07:00
Kenfe-Mickael Laventure
28b7aa5355
Use log package instead of logrus in eventSink.Write 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 17:51:57 -07:00
Kenfe-Mickael Laventure
f8d3cfbc60
containerd: Do not fail on plugin failure 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 17:51:57 -07:00
Kenfe-Mickael Laventure
b7f37e778c
containerd-shim: Do not crash when receiving RPC before a Create() is issued 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 17:51:57 -07:00
Kenfe-Mickael Laventure
d3e7af2c0a
containerd-shim: Refuse connection from uid/gid different from the shim process 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 17:50:13 -07:00
Kenfe-Mickael Laventure
95afeb7831
containerd-shim: Use abstract namespace for the unix socket 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 17:48:08 -07:00
Derek McGowan
6aafe66894
Add dev report for June 23, 2017 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-23 17:11:56 -07:00
Stephen Day
8644a08c96 Merge pull request #1077 from crosbymichael/shim 
Move shim API into linux sub pkg
 2017-06-23 16:50:12 -07:00
Stephen J Day
70815af652
identifiers: use common package for identifier validation 
A few days ago, we added validation for namespaces. We've decided to
expand these naming rules to include containers. To facilitate this, a
common package `identifiers` now provides a common validation area.
These rules will be extended to apply to task identifiers, snapshot keys
and other areas where user-provided identifiers may be used.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-23 16:46:45 -07:00
Michael Crosby
ba78503769 Merge pull request #1084 from stevvooe/event-conversion-tests 
events: add conversion tests
 2017-06-23 16:44:32 -07:00
Stephen J Day
cf0b221549
events: add conversion tests 
Other: How do you know these event conversions work?
Steve: Well, they've been tested and benchmarked, of course!
Other: Where are the tests?
Steve: It's easy, just check out the branch you want to test on my
       machine and the tests are right there. So easy!
Other: <facepalm>

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-23 16:33:42 -07:00
Michael Crosby
990536f2cc Move shim protos into linux pkg 
This moves the shim's API and protos out of the containerd services
package and into the linux runtime package. This is because the shim is
an implementation detail of the linux runtime that we have and it is not
a containerd user facing api.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 16:21:47 -07:00
Michael Crosby
e69423f931 Merge pull request #1079 from crosbymichael/delete 
Add DeleteOpts for container deletion
 2017-06-23 15:25:36 -07:00
Michael Crosby
6ad3ba739e Merge pull request #1073 from stevvooe/consolidate-types-package 
api/types: consolidate types package
 2017-06-23 13:58:02 -07:00
Stephen J Day
12c0daa9c9
api/types: consolidate types package 
To simplify use of types, we have consolidate the packages for the mount
and descriptor protobuf types into a single Go package. We also drop the
versioning from the type packages, as these types will remain the same
between versions.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-23 13:50:28 -07:00
Michael Crosby
4ecba2997e Merge pull request #1081 from crosbymichael/rebase-fix 
[ctr] fix tasks service reference
 2017-06-23 13:49:24 -07:00
Kenfe-Mickaël Laventure
40f2627ce1 Merge pull request #1008 from crosbymichael/kill-error 
Fix error on double Kill calls
 2017-06-23 13:48:49 -07:00
Michael Crosby
dff9efa5f3 [ctr] fix tasks service refernce 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 13:43:18 -07:00
Michael Crosby
8302ca4c62 Merge pull request #1057 from crosbymichael/embed 
Create server package for containerd daemon
 2017-06-23 13:37:48 -07:00
Michael Crosby
3b9d9dfa3e Fix error on doulbe Kill calls 
This returns a typed error for calls to Kill when the process has
already finished.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 13:28:48 -07:00
Michael Crosby
8d9ccd646b Merge pull request #935 from kunalkushwaha/ctr-fix-914 
Container list and Task List printed separately.
 2017-06-23 13:16:07 -07:00
Michael Crosby
c6a2f14674 Merge pull request #1080 from mlaventure/small-cleanup 
Simplify task.Wait() a bit
 2017-06-23 13:00:18 -07:00
Michael Crosby
003ad67375 Move platformInit and plugin load to server 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 12:06:31 -07:00
Kenfe-Mickael Laventure
79086a1873
Simplify task.Wait() a bit 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-23 12:05:24 -07:00
Kenfe-Mickaël Laventure
003ed58859 Merge pull request #1072 from stevvooe/move-events-to-services-pkg 
events: move types into service package
 2017-06-23 12:02:22 -07:00
Michael Crosby
3f45e4369e Add DeleteOpts for container deletion 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-23 11:57:29 -07:00