Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/runtime/v1/linux/runtime.go b/runtime/v1/linux/runtime.go
- index 6bda8f9a..699032b7 100644
- --- a/runtime/v1/linux/runtime.go
- +++ b/runtime/v1/linux/runtime.go
- @@ -41,7 +41,7 @@ import (
- "github.com/containerd/containerd/plugin"
- "github.com/containerd/containerd/runtime"
- "github.com/containerd/containerd/runtime/linux/runctypes"
- - "github.com/containerd/containerd/runtime/v1"
- + v1 "github.com/containerd/containerd/runtime/v1"
- "github.com/containerd/containerd/runtime/v1/linux/proc"
- shim "github.com/containerd/containerd/runtime/v1/shim/v1"
- runc "github.com/containerd/go-runc"
- diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
- index 6e87f052..1269c042 100644
- --- a/runtime/v1/shim/service.go
- +++ b/runtime/v1/shim/service.go
- @@ -25,6 +25,7 @@ import (
- "io/ioutil"
- "os"
- "path/filepath"
- + sysruntime "runtime"
- "sync"
- "github.com/containerd/console"
- @@ -123,7 +124,6 @@ func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (_ *
- Options: m.Options,
- })
- }
- -
- rootfs := ""
- if len(mounts) > 0 {
- rootfs = filepath.Join(r.Bundle, "rootfs")
- @@ -659,7 +659,11 @@ func newInit(ctx context.Context, path, workDir, runtimeRoot, namespace, criu st
- })
- p.Bundle = r.Bundle
- p.Platform = platform
- - p.Rootfs = rootfs
- + if sysruntime.GOOS == "darwin" {
- + p.Rootfs = filepath.Join(path, "rootfs")
- + } else {
- + p.Rootfs = rootfs
- + }
- p.WorkDir = workDir
- p.IoUID = int(options.IoUid)
- p.IoGID = int(options.IoGid)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement