Merge pull request #4822 from samuelkarp/freebsd

Build on FreeBSD
This commit is contained in:
Phil Estes
2020-12-11 08:30:03 -05:00
committed by GitHub
17 changed files with 232 additions and 25 deletions

View File

@@ -22,7 +22,8 @@ import (
"os"
"os/signal"
"github.com/containerd/containerd/runtime/v1/shim"
"github.com/containerd/containerd/sys/reaper"
runc "github.com/containerd/go-runc"
"github.com/containerd/ttrpc"
)
@@ -34,7 +35,7 @@ func setupSignals() (chan os.Signal, error) {
signal.Notify(signals)
// make sure runc is setup to use the monitor
// for waiting on processes
runc.Monitor = shim.Default
runc.Monitor = reaper.Default
return signals, nil
}