From 788a730fc9731051a8c39f915cdee9503ea01908 Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Mon, 18 Mar 2019 15:43:13 +0800 Subject: [PATCH] Revert "feature: independent runtime root" This reverts commit 8e84b8b07864e7ac6796b4d973de2d5e1123edf9. --- ctrd/container.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ctrd/container.go b/ctrd/container.go index d354ae70c..a7cdaba67 100644 --- a/ctrd/container.go +++ b/ctrd/container.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "io" - "path" "runtime" "strings" "sync" @@ -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, }), }