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

835 Commits

Author SHA1 Message Date
Wei Fu
6424a36032 ctr/commands/images/push: don't show progress if it is debug mode 
If user sets debug mode, the command push should only show the debug log
information. If the stdout is with flush by the progress status, it is
hard to see the debug log.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-03-05 22:21:55 +08:00
Michael Crosby
dea27b1b64 Merge pull request #3036 from jhowardmsft/jjh/etw 
Windows: Enable ETW logging
 2019-02-21 20:12:35 -05:00
John Howard
e0d7ed12a5 Windows: Enable ETW logging 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2019-02-21 14:16:44 -08:00
Michael Crosby
84a24711e8 Add runc.v2 multi-shim 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-02-21 11:09:46 -05:00
Michael Crosby
6bcbf88f82 Move runc shim code into common package 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-02-21 10:47:41 -05:00
Veeraiah Chowdary Nuvvula
f6ac73d71e fixing typo and added a missing comment. 
Signed-off-by: Veeraiah Chowdary Nuvvula <venuvvul@microsoft.com>
 2019-02-18 14:13:02 -08:00
John Howard
88f19a90a8 Windows: Update stackdump event name 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2019-02-15 15:33:29 -08:00
Justin Terry (VM)
00895670e7 Stop sending stderr with TTY on Windows 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-02-11 23:11:40 -08:00
John Howard
59ea134ce1 OCI Modifiers for Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>

Needed for the containerd work on Windows and integrating the
oci package from containerd into moby.

No longer sets defaults for
 - .Process.ConsoleSize
 - .Windows.IgnoreFlushesDuringBoot
 - .Windows.Network.AllowUnqualifiedDNSQuery

Adds helper functions and tests for
 - WithWindowsIgnoreFlushesDuringBoot
 - WithWindowNetworksAllowUnqualifiedDNSQuery

Updates `ctr run` on Windows to use the new helper functions,
ConsoleSize is already handled.
 2019-02-06 10:44:36 -08:00
Wei Fu
132ee9b826 fix: linter issue 
megacheck, gosimple and unused has been deprecated and subsumed by
staticcheck. And staticcheck also has been upgraded. we need to update
code for the linter issue.

close: #2945

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-01-23 22:54:51 +08:00
Phil Estes
df97414a77 Merge pull request #2622 from kadisi/export_bug 
fix ctr image export not found error
 2019-01-16 12:59:34 -05:00
Phil Estes
06e04bc5a9 Merge pull request #2830 from Ace-Tang/support_cr_without_image 
cr: support checkpoint/restore without image
 2018-12-20 13:24:37 -05:00
kadisi
40267382c5 fix ctr image export not found error 
Signed-off-by: Jie Zhang <iamkadisi@163.com>
 2018-12-17 08:52:28 +08:00
Justin Cormack
8be05eb237 Fix freebsd build 
This brings freebsd in line with Darwin, ie it builds, but some parts may not yet
be fully functional. There is now a WIP `runc` port for FreeBSD at
https://github.com/clovertrail/runc/tree/1501-SupportOnFreeBSD so should be able
to test further.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
 2018-12-16 14:27:42 +00:00
Wei Fu
603e97a9ec ctr/content: make editor flag is required 
The $EDITOR is not clear for user. If the env doesn't set the value for
$EDITOR, the users don't know how to use this subcommand when they get
error like this:

```
sh: 1: /tmp/edit-605573012: Permission denied
```

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2018-12-11 18:55:09 +08:00
Justin Terry (VM)
7ac221e8d7 Adding ctr memory and cpu flags 
Adds ctr run --memory-limit for all platforms.
Adds ctr run --cpu-count for Windows platforms.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-12-10 13:31:59 -08:00
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
Ace-Tang
6593399e9f cr: support checkpoint/restore without image 
support checkpoint without committing a checkpoint dir into a
checkpoint image and restore without untar image into checkpoint
directory. support for both v1 and v2 runtime

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-11-29 10:19:39 +08: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