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

5213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ace-Tang
fd16bf6d46 runtimev2: add image-path and work-path for c/r 
add ImagePath and WorkPath for checkpoint process, add CriuImagePath
and CriuWorkPath for create process in runtime v2 protobuf

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-11-24 23:08:25 +08:00
Ace-Tang
83ebcf9992 runtimev1: add image-path and work-path for c/r 
add ImagePath and WorkPath for checkpoint process, add CriuImagePath
and CriuWorkPath for create process in runtime v1 protobuf

Signed-off-by: Ace-Tang <aceapril@126.com>
 2018-11-24 23:08:25 +08: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
Derek McGowan
75c490c5c4
Merge pull request #2825 from Ace-Tang/ctr_fix_runtime 
fix: should get runtime name from container info
 2018-11-23 13:19:27 -08:00
Lifubang
bbc2a995f9 use state machine management for exec.Pid() 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-23 17:46:32 +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
Derek McGowan
b8631c750c
Merge pull request #2751 from Charliekenney23/add-useragent-resolver-option 
Add custom headers resolver option
 2018-11-20 10:51:10 -08:00
Derek McGowan
0b064b0f9d
Merge pull request #2813 from lifubang/deleteexec 
add ctr delete --exec-id to help debug DeleteProcess
 2018-11-20 10:49:13 -08:00
Michael Crosby
c0a3b6e823
Merge pull request #2812 from tonistiigi/credential-nil-check 
remotes: avoid panic with default resolver conf
 2018-11-20 10:19:38 -05:00
Phil Estes
181a522142
Merge pull request #2807 from lifubang/shimlockwhenstdinclose 
fix pipe in broken may cause shim lock forever
 2018-11-20 22:38:22 +08:00
Phil Estes
1a62577719
Merge pull request #2811 from Random-Liu/lock-kill-all 
Lock `KillAll`.
 2018-11-20 22:36:30 +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
Tonis Tiigi
a2e8ab9ff7 remotes: avoid panic with default resolver conf 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-11-19 17:33:59 -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
Lantao Liu
7d91d631e0 Lock KillAll. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-11-19 15:19:35 -08:00
Phil Estes
f801661dcf
Merge pull request #2809 from HusterWan/zr/octet-stream-fix 
refactor: no need so many defer in closeAll function
 2018-11-20 06:23:30 +08:00
Michael Wan
9639db5522 refactor: no need defer in closeAll 
Signed-off-by: Michael Wan <zirenwan@gmail.com>
 2018-11-19 09:41:38 -05:00
Michael Crosby
aa537a67b3
Merge pull request #2797 from lifubang/createcmd 
change args usage for ctr c create
 2018-11-19 09:36:52 -05:00
Lifubang
e76a8879eb fix pipe in broken may cause shim lock forever for runtime v1 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-19 09:25:43 +08:00
Lifubang
b3438f7a6f fix pipe in broken may cause shim lock forever for runtime v2 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2018-11-19 09:02:49 +08:00
Akihiro Suda
e1383c3d23
Merge pull request #2799 from BSWANG/patch-1 
Add build requirement doc on fedora/centos
 2018-11-17 13:05:22 +09:00
Phil Estes
d8621e258c
Merge pull request #2800 from crosbymichael/revert-dropped 
Revert v2 dropped events
 2018-11-17 09:01:58 +08:00
Michael Crosby
d48d7464ad
Merge pull request #2773 from crosbymichael/state-locking 
Fix process locking and state management
 2018-11-16 14:15:04 -05:00
Michael Crosby
ee41ce3f8c
Merge pull request #2788 from crosbymichael/runc-bump 
Update runc to 10d38b660a77168360df3522881e2dc2be
 2018-11-16 12:39:47 -05:00
Michael Crosby
956e49a36b Revert v2 dropped events 
Partial revert of #2748

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-11-16 11:34:15 -05: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
Bingshen Wang
581a63ce4e Add build requirement doc on fedora/centos 
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2018-11-16 18:53:15 +08: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
Phil Estes
44b90df286
Merge pull request #2794 from wk8/wk8/nvidia_kmods 
Adding a --load-kmods flag to the NVIDIA OCI hook
 2018-11-16 11:50:37 +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
Jean Rouge
90880078b9 Adding a --load-kmods flag to the NVIDIA OCI hook 
Signed-off-by: Jean Rouge <jer329@cornell.edu>
 2018-11-15 01:52:11 -08:00
Michael Crosby
e1a59ba0fb Update runc to 10d38b660a77168360df3522881e2dc2be 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-11-14 14:02:41 -05:00
Michael Crosby
a3c2f00c50
Merge pull request #2786 from jterry75/revendor_logrus 
Revendor github.com/sirupsen/logrus to v1.0.3
 2018-11-14 11:58:58 -05:00
Justin Terry (VM)
8e25ca6bf0 Revendor github.com/sirupsen/logrus to v1.0.3 
logrus v1.0.3 was the first release that include the change in
terminal_windows.go that stops exec'ing "cmd ver" to obtain the version
information and rather uses the x/sys/crypto/terminal.IsTerminal on the
console fd. On Windows this is a significant performance difference to
avoid the additional process activation of the "cmd ver" for each
invocation of the shim/runhcs executables.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-13 09:27:29 -08:00
Evan Hazlett
0e7a70dbfb skip already exists content 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2018-11-12 11:48:18 +00: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
Phil Estes
c7896bd722
Merge pull request #2775 from jterry75/vendor_hcsshim 
Revendor github.com/Microsoft/hcsshim
 2018-11-10 14:13:28 -05:00
Phil Estes
f0bedbbd32
Merge pull request #2776 from thaJeztah/ignore_modprobe_failures 
Ignore modprobe failures in ExecStartPre (systemd unit)
 2018-11-10 14:09:40 -05:00
Sebastiaan van Stijn
555ea3fb43
Ignore modprobe failures in ExecStartPre (systemd unit) 
When running containerd inside LXC, due to systemd being unable to execute
`modprobe overlay` inside the container (module is already loaded in host kernel).

This patch adds a `-` prefix to the `ExecStartPre` command, so that failures
are ignored, and the service can start as usual.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-11-10 12:52:06 +01:00
Justin Terry (VM)
abd971cfbd Revendor github.com/Microsoft/hcsshim 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2018-11-09 15:51:44 -08:00
Michael Crosby
96d30788e1
Merge pull request #2770 from Random-Liu/partial-revert-#2748 
Partially revert the event discard change in #2748.
 2018-11-09 15:57:33 -05:00