Aaron Lehmann
cf9fcdc71a
Avoid panic when spec file is missing sections under Resources
...
Check pointers against nil before dereferencing them. Skip any sections
that are nil, since that's equivalent to having no values defined for
those sections.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-15 16:04:52 -08:00
Michael Crosby
a4576937f9
Merge pull request #66 from coolljt0725/fix_termimal
...
Fix container exit not restore terminal and close stdin
2016-01-11 10:22:22 -08:00
Lei Jitang
80ce7650f4
Fix container exit without restore terminal
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-06 16:25:38 +08:00
Michael Crosby
476a54714d
Merge pull request #64 from LK4D4/trim_deps
...
Revert "Use protoversion for containerd version"
2016-01-05 13:23:20 -08:00
Alexander Morozov
e55ebadb09
Revert "Use protoversion for containerd version"
...
This reverts commit d2e319523d
.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-05 13:07:47 -08:00
Michael Crosby
c141cb670f
Fix nil checks for cgroup fields
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-01-04 13:40:28 -08:00
Michael Crosby
ee4d203715
Merge pull request #63 from kunalkushwaha/master
...
Fixes the compile issue #62
2016-01-04 13:26:15 -08:00
Kunal Kushwaha
a3cf409ada
Fixes the compile issue#62
...
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-12-25 11:58:11 +09:00
Alexander Morozov
f51744f8c0
Merge pull request #56 from LK4D4/fix_chan
...
Fix adding to chanotify on blocking select
2015-12-22 14:57:25 -08:00
Alexander Morozov
e2f3518af8
Fix adding to chanotify on blocking select
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-22 08:28:37 -08:00
Michael Crosby
d99ee27874
Merge branch 'stats'
2015-12-18 16:54:27 -08:00
Michael Crosby
7d4f74474e
Add more metrics collection
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-18 16:54:02 -08:00
Michael Crosby
d08b005ca9
Merge pull request #54 from LK4D4/chanotify_package
...
Chanotify package
2015-12-18 15:44:39 -08:00
Alexander Morozov
4f0c3850ba
Use chanotify in supervisor
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-18 12:17:53 -08:00
Alexander Morozov
fed10a2c22
Add chanotify package
...
It allows to listen for notifications on bunch of channels.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-18 11:46:45 -08:00
Alexander Morozov
5c4b7a66c0
Merge pull request #51 from peter-edge/protoversion
...
Use protoversion for containerd version
2015-12-18 10:53:04 -08:00
Michael Crosby
9d1464e72f
Merge pull request #53 from jfrazelle/makefile-ci
...
add dockerfile/makefile additions for ci
2015-12-18 10:41:12 -08:00
Jessica Frazelle
5b3f41c244
add dockerfile/makefile additions for ci
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-18 09:18:14 -08:00
Alexander Morozov
5ba65116ec
Merge pull request #46 from runcom/fix-readme-typo
...
README.md: fix typo
2015-12-18 09:02:43 -08:00
Peter Edge
d2e319523d
Use protoversion for containerd version
...
Signed-off-by: Peter Edge <peter.edge@gmail.com>
2015-12-18 13:06:04 +00:00
Antonio Murdaca
f1b2d5ab60
README.md: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 10:32:46 +01:00
Michael Crosby
1d63236c27
Merge pull request #43 from LK4D4/supervisor_package
...
Move supervisor to it's own package
2015-12-17 16:23:47 -08:00
Alexander Morozov
69f8f566a2
Move supervisor to it's own package
...
It allows to keep main namespace cleaner
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-17 16:18:48 -08:00
Michael Crosby
6f71180bf0
Merge pull request #42 from thaJeztah/add-maintainers
...
Add MAINTAINERS file
2015-12-17 15:37:25 -08:00
Sebastiaan van Stijn
491e497f2f
Add MAINTAINERS file
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-18 00:16:45 +01:00
Michael Crosby
9a445dd842
Merge pull request #41 from thaJeztah/update-license
...
Update copyright and license
2015-12-17 15:13:54 -08:00
Michael Crosby
71a544f824
Merge pull request #40 from thaJeztah/fix-typo
...
Fix typo in README
2015-12-17 15:13:10 -08:00
Sebastiaan van Stijn
c58674286d
Update copyright and license
...
Documentation for the open source projects uses a
different license than the code.
For reference, see https://github.com/docker/libkv/pull/59
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-18 00:08:16 +01:00
Sebastiaan van Stijn
086773b823
Fix typo in README
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-17 23:56:40 +01:00
Michael Crosby
b296d50493
Update resource on libcontainer change
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-17 13:58:50 -08:00
Michael Crosby
c4f3b71344
Merge pull request #37 from tonistiigi/close-stdin
...
Close stdin after data has been copied
2015-12-17 13:43:34 -08:00
Michael Crosby
e489dd8b28
Merge pull request #36 from cpuguy83/docs_typos
...
fix some docs typos and wording
2015-12-17 13:42:25 -08:00
Tonis Tiigi
ae5c752449
Close stdin after data has been copied
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-17 13:42:08 -08:00
Brian Goff
866ad6fe1d
fix some docs typos and wording
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-12-17 16:02:58 -05:00
Patrick Chanezon
5faf2bd102
Update README.md
2015-12-17 12:25:52 -08:00
Michael Crosby
286b5aaa00
Merge pull request #34 from LK4D4/graphite_support
...
Add graphite metrics support
2015-12-16 16:09:44 -08:00
Alexander Morozov
f3d2b60bab
Add graphite metrics support
...
I tried with https://github.com/hopsoft/docker-graphite-statsd and it
looks pretty nice. We can see how different metrics depends on a number of
containers and find bottlenecks under heavy load.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-16 16:03:08 -08:00
Michael Crosby
9bddc01b78
Merge pull request #33 from LK4D4/event_loop
...
Event loop package
2015-12-16 14:07:17 -08:00
Alexander Morozov
79591b2ae1
Use eventloop package in containerd
...
It's first attempt to decouple code into independent modules for more
effective unit-testing.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-16 13:56:20 -08:00
Alexander Morozov
7332e6e847
Add eventloop package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-16 13:53:03 -08:00
Michael Crosby
4eb0a4ef8d
Merge branch 'docs'
2015-12-16 12:15:25 -08:00
Michael Crosby
83eeb131d8
Update readme and documentation for release
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-16 12:15:22 -08:00
Michael Crosby
c35cf680b0
Merge pull request #32 from LK4D4/stop_collection
...
Stop stats collection on container exit
2015-12-16 11:26:42 -08:00
Alexander Morozov
188eeae376
Stop stats collection on container exit
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-16 09:39:28 -08:00
Michael Crosby
ab9be566cf
Bump version to 0.0.4
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-15 17:03:11 -08:00
Michael Crosby
8167d2b13f
Add license
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-15 16:59:24 -08:00
Michael Crosby
76cf593212
Add oom notifications and pid to create response
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-15 16:22:53 -08:00
Michael Crosby
ec31245f54
Add exec process log support
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-15 11:43:51 -08:00
Michael Crosby
db181c6132
Add benchmark tool to gitignore
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-15 11:04:38 -08:00
Michael Crosby
75eeb1eb6f
Rename start.go to create.go
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-12-15 10:54:00 -08:00