From 23aab35fdbddc1977dd3078fa6cfa5065e333156 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 3 May 2020 15:03:52 +0200 Subject: [PATCH] Remove libcontainer from containerd-shim Replace the libcontainer variant with the one in our sys package Signed-off-by: Sebastiaan van Stijn --- cmd/containerd-shim/shim_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/containerd-shim/shim_linux.go b/cmd/containerd-shim/shim_linux.go index 4d81aa6d5..4916d1ac3 100644 --- a/cmd/containerd-shim/shim_linux.go +++ b/cmd/containerd-shim/shim_linux.go @@ -20,10 +20,10 @@ import ( "os" "os/signal" + "github.com/containerd/containerd/sys" "github.com/containerd/containerd/sys/reaper" runc "github.com/containerd/go-runc" "github.com/containerd/ttrpc" - "github.com/opencontainers/runc/libcontainer/system" "golang.org/x/sys/unix" ) @@ -36,7 +36,7 @@ func setupSignals() (chan os.Signal, error) { // for waiting on processes runc.Monitor = reaper.Default // 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 signals, nil