Skip to content

Commit

Permalink
Revert "feature: independent runtime root"
Browse files Browse the repository at this point in the history
This reverts commit 8e84b8b.
  • Loading branch information
fuweid authored and zhuangqh committed Mar 18, 2019
1 parent a07f1ba commit 788a730
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions ctrd/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/json"
"fmt"
"io"
"path"
"runtime"
"strings"
"sync"
Expand Down Expand Up @@ -541,7 +540,7 @@ func (c *Client) createContainer(ctx context.Context, ref, id, checkpointDir str
containerd.WithContainerLabels(container.Labels),
containerd.WithRuntime(fmt.Sprintf("io.containerd.runtime.v1.%s", runtime.GOOS), &runctypes.RuncOptions{
Runtime: container.Runtime,
RuntimeRoot: path.Join(runtimeRoot, container.Runtime),
RuntimeRoot: runtimeRoot,
SystemdCgroup: container.UseSystemd,
}),
}
Expand Down

0 comments on commit 788a730

Please sign in to comment.