Merge pull request #5936 from ukontainer/feature-darwin-runtime-shim

darwin: runtime support
This commit is contained in:
Phil Estes
2021-09-08 09:34:27 -04:00
committed by GitHub
6 changed files with 86 additions and 7 deletions

View File

@@ -30,6 +30,7 @@ import (
"syscall"
"time"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/dialer"
"github.com/containerd/containerd/sys"
@@ -63,7 +64,7 @@ func AdjustOOMScore(pid int) error {
return nil
}
const socketRoot = "/run/containerd"
const socketRoot = defaults.DefaultStateDir
// SocketAddress returns a socket address
func SocketAddress(ctx context.Context, socketPath, id string) (string, error) {