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

818 Commits

Author SHA1 Message Date
Michael Crosby
4a8acf54b1 Merge pull request #2793 from lifubang/runexecflag 
fix container cmd args may parsed as ctr args
 2018-12-04 11:05:51 -05:00
Lifubang
2d3a4f99ec should no defer when detach 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-12-03 19:18:57 +08:00
Michael Crosby
09a5b1f8af Merge pull request #2839 from jhowardmsft/jjh/service 
Windows: Allow running as a service
 2018-11-30 11:11:16 -05:00
Derek McGowan
82c57a3a38 Merge pull request #2828 from jterry75/ctr_isolation 
Move ctr run --isolation to Windows only
 2018-11-28 10:36:50 -08:00
Justin Terry (VM)
b4a642f6a5 Add dumpStacks support for containerd on Windows 
Resolves: #1763

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-27 21:02:32 -08:00
John Howard
40d898a820 Windows: Allow running as a service 
Signed-off-by: John Howard <jhoward@microsoft.com>

Allows containerd.exe to run as a Windows service. eg

Register: `.\containerd.exe --register-service`

Start: `net start containerd`
...
Stop: `net stop containerd`

Unregister: `.\containerd.exe --unregister-service`

When running as a service, logs will go to the Windows application
event log.
 2018-11-27 17:28:04 -08:00
Michael Crosby
3eae8b9c3f Merge pull request #2631 from masters-of-cats/shim-io-redirect 
Use named pipes for shim logs
 2018-11-27 10:44:00 -05:00
Justin Terry (VM)
f90e5d564a Move ctr run --isolation to Windows only 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-23 17:11:59 -08:00
Ace-Tang
461222dba8 fix: should get runtime name from container info 
when use `ctr t checkpoint`, runtime name should get from container
info, but not passed by flag, since task has already running with
specified runtime

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-11-23 15:39:43 +08:00
Derek McGowan
32aa0cd79b Merge pull request #2632 from ehazlett/checkpoint-restore 
Refactor checkpoint and restore to client
 2018-11-20 16:31:08 -08:00
Lifubang
2101b1362e add ctr delete --exec-id to debug DeleteProcess 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-20 19:53:06 +08:00
Phil Estes
55baf50b5a Merge pull request #2798 from lifubang/execd 
add flag -d for ctr t exec to run a service in container
 2018-11-20 08:34:29 +08:00
Julia Nedialkova
1d4105cacf Use named pipes for shim logs 
Relating to issue [#2606](https://github.com/containerd/containerd/issues/2606)

Co-authored-by: Oliver Stenbom <ostenbom@pivotal.io>
Co-authored-by: Georgi Sabev <georgethebeatle@gmail.com>
Co-authored-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Co-authored-by: Danail Branekov <danailster@gmail.com>

Signed-off-by: Oliver Stenbom <ostenbom@pivotal.io>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
Signed-off-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Signed-off-by: Danail Branekov <danailster@gmail.com>
 2018-11-16 16:11:43 +02:00
Lifubang
01f5aa3878 add flag -d for ctr t exec to run a service in container 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-16 14:29:45 +08:00
Lifubang
51ad4d3020 change args usage for ctr c create 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-16 14:09:39 +08:00
Lifubang
bd2a21985c fix container cmd args may parsed as ctr args 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-15 18:32:04 +08:00
Evan Hazlett
6f2f4e4343 checkpoint: add copts to checkpoint; save snapshotter to annotation 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:48:16 +00:00
Evan Hazlett
40caece8dc update tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
4fdf720b84 move rw to opt; make snapshot opt; move to NewContainerOpts 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
147208061c add image name and runtime name media types; remove task operation on checkpoint 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
ce0673fd7d Restore take image 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:17 +00:00
Evan Hazlett
0e4d9da755 remove task handling from Restore 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:47:16 +00:00
Evan Hazlett
2d3db08daf refactor spec and snapshot restore into opts 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:45:22 +00:00
Evan Hazlett
45c700a955 refactor checkpoint and restore to client 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:45:22 +00:00
Akihiro Suda
dd0539b095 ctr: add --cgroup for oci.WithCgroup 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-11-06 17:39:30 +09:00
Michael Crosby
2a10bc7b44 Merge pull request #2759 from fuweid/bugfix_use_right_flag_value 
bugfix: use skip-verify flag not insecure in ctr
 2018-11-05 14:20:56 -05:00
Justin Terry (VM)
354dab0caa Forward ctr.exe --debug as io.containerd.runhcs.v1 options 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-05 09:08:48 -08:00
Justin Terry (VM)
8329a491b9 Build Windows V1 and V2 runtimes always 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-02 11:59:03 -07:00
Wei Fu
a02f7cea86 bugfix: use skip-verify flag in ctr instead of insecure 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-11-02 23:51:37 +08:00
Ace-Tang
c3cac72b92 ctr: fix potential panic in metric 
Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-10-23 14:01:50 +08:00
Phil Estes
0dd3211a06 Remove containerd-release tool from main repo 
The release-tool is now located in the `containerd/project` repo.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-10-19 12:13:38 -04:00
Wei Fu
06616dab00 enhance: split config from server package 
The github.com/containerd/containerd/services/server has a lot of
dependencies, like content, snapshots services implementation and
docker-metrics.

For the client side, it uses the config struct from server package
to start up the containerd in background. It will import a lot of
useless packages which might be conflict with existing vendor's package.

It makes integration easier with single config package.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-10-17 16:34:39 +08:00
Michael Crosby
f1dfe86ef4 Merge pull request #2688 from crosbymichael/ctrdecodespec 
decode spec in `ctr c info`
 2018-10-16 09:38:43 -04:00
Michael Crosby
9fe52f66d6 Merge pull request #2721 from Ace-Tang/master 
ctr: add some metric item
 2018-10-16 09:38:30 -04:00
Ace-Tang
7ea75ef4a9 ctr: add some metric item 
add memory limit, pid info into metric subcommand, since moby also
show them. As blkio read/write IO need more calculation，not add them.

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-10-16 16:54:06 +08:00
Michael Crosby
e86a0689fb Fix stress test for image config opt requirements 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-10-15 18:58:16 -04:00
Phil Estes
1a5f9a3434 Merge pull request #2710 from fuweid/enhance_support_duration_for_cpu_profile_collection 
enhance: support specific duration for profile collection
 2018-10-11 11:00:25 -04:00
Wei Fu
a2a23d91ca enhance: support specific duration for profile collection 
The default duration of cpu profile collection in net/http/pprof is 30
seconds. User should have chance to set the specific duration for the
collection.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-10-10 22:57:54 +08:00
Phil Estes
43acab8100 Merge pull request #2690 from dmcgowan/resolver-updates 
Update Docker resolver to pass in Authorizer interface
 2018-10-03 09:58:42 +02:00
Derek McGowan
a6198b7692 Update resolver code 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-28 14:32:23 -07:00
Samuel Karp
607888ce29 ctr: make kill use stop-signal by default 
The OCI image specification includes a `StopSignal` field in the image
configuration, denoting the system call signal to be sent to the
container to exit.  This commit adds a new `WithImageStopSignal` container
option that can be used for storing the `StopSignal` field as a label on
the container.  This commit also adjusts `ctr run` to call
`WithImageStopSignal` and `ctr tasks kill` to send the signal stored in
that label by default.

Signed-off-by: Samuel Karp <skarp@amazon.com>
 2018-09-27 15:53:38 -07:00
Samuel Karp
b392a3a8e4 signals: move ParseSignal to containerd package 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2018-09-27 15:53:38 -07:00
Lifubang
cb0eed833d decode Spec value in command 'ctr c info <containerid>' 
Signed-off-by: Lifubang <lifubang@aliyun.com>

fix some errors

use typeurl.UnmarshalAny instead json.Unmarshal to interface{}

Signed-off-by: Lifubang <lifubang@aliyun.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-09-27 10:44:54 -04:00
Michael Crosby
6496078ef8 Merge pull request #2669 from estesp/fix-withuser-comment 
Remove a TODO from the code comments that is complete
 2018-09-21 14:17:23 -04:00
Justin Terry (VM)
547bb94e4b Fix ctr run for Windows containers 
1. Fixes bugs in ctr run that were introduced by 1d9b969
2. Adds support for the --isolated flag that runs Windows HyperV
cotainers instead of process isolated containers on Windows.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-09-20 14:28:36 -07:00
Phil Estes
41615e8ded Remove a TODO from the code comments that is complete 
WithUser... helpers do support non-snapshot rootfs now.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2018-09-20 09:07:36 -04:00
Derek McGowan
9faeea1e5e Merge pull request #2649 from estesp/nonewpriv-flag 
Add flag to ctr for running with "NoNewPrivileges: false"
 2018-09-19 11:17:05 -07:00
Michael Crosby
1ad49689d3 Reduce publish connection timeout 
Fixes #2662

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-09-19 11:21:40 -04:00
Derek McGowan
a62be324b7 Unify docker and oci importer 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-17 14:41:43 -07:00
Derek McGowan
bce20b75da Simplify docker importer 
Support any layout and rely on manifest.json to reference blobs

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-09-14 14:21:27 -07:00