InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update daemon code for containerd API changes

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-11-29 19:15:20 -05:00
parent 5bd902b5cf
commit aa3ce07c41
12 changed files with 86 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/start_unix.go
View File

@@ -7,7 +7,7 @@ import (
"os/exec"
"path/filepath"
"github.com/containerd/containerd/linux/runcopts"
"github.com/containerd/containerd/linux/runctypes"
"github.com/docker/docker/container"
"github.com/pkg/errors"
)
@@ -42,7 +42,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
if err != nil {
return nil, err
}
opts := &runcopts.RuncOptions{
opts := &runctypes.RuncOptions{
Runtime: path,
RuntimeRoot: filepath.Join(daemon.configStore.ExecRoot,
fmt.Sprintf("runtime-%s", container.HostConfig.Runtime)),