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

darwin: use the default values for socketRoot variable

Browse Source 
Since the /run directory on macOS is read-only, darwin containerd should
use a different directory.  Use the pre-defined default values instead
to avoid this issue.

Fixes: bd908acab ("Use path based unix socket for shims")
Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
This commit is contained in:
Hajime Tazaki 2020-12-15 08:12:22 +09:00
parent e00f87f1dc
commit 5dd38792a8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/v2/shim/util_unix.go
View File

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