github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4226 from thaJeztah/remove_libcontainer_from_shim

Browse Source 
Remove libcontainer from containerd-shim
This commit is contained in:
Wei Fu 2020-05-04 08:51:02 +08:00 committed by GitHub
commit b354188618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/containerd-shim/shim_linux.go
View File

@ -20,10 +20,10 @@ import (
"os" "os"
"os/signal" "os/signal"
"github.com/containerd/containerd/sys"
"github.com/containerd/containerd/sys/reaper" "github.com/containerd/containerd/sys/reaper"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
"github.com/opencontainers/runc/libcontainer/system"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@ -36,7 +36,7 @@ func setupSignals() (chan os.Signal, error) {
// for waiting on processes // for waiting on processes
runc.Monitor = reaper.Default runc.Monitor = reaper.Default
// set the shim as the subreaper for all orphaned processes created by the container // set the shim as the subreaper for all orphaned processes created by the container
if err := system.SetSubreaper(1); err != nil { if err := sys.SetSubreaper(1); err != nil {
return nil, err return nil, err
} }
return signals, nil return signals, nil