From 086201a5f52d60f918c60ebd6770278116ec05fc Mon Sep 17 00:00:00 2001
From: Sebastiaan van Steenis <mail@superseb.nl>
Date: Fri, 16 Feb 2018 18:10:14 +0100
Subject: [PATCH] Use configured docker daemon root dir on kubelet

---
 cluster/plan.go | 2 +-
 hosts/hosts.go  | 3 +++
 hosts/tunnel.go | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cluster/plan.go b/cluster/plan.go
index bc7aa755..0af2fd77 100644
--- a/cluster/plan.go
+++ b/cluster/plan.go
@@ -216,7 +216,7 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host) v3.Process {
 		"/var/lib/cni:/var/lib/cni:z",
 		"/etc/resolv.conf:/etc/resolv.conf",
 		"/sys:/sys",
-		"/var/lib/docker:/var/lib/docker:rw,z",
+		host.DockerInfo.DockerRootDir + ":" + host.DockerInfo.DockerRootDir + ":rw,z",
 		"/var/lib/kubelet:/var/lib/kubelet:shared,z",
 		"/var/run:/var/run:rw",
 		"/run:/run",
diff --git a/hosts/hosts.go b/hosts/hosts.go
index ce1a5bd4..822a4fd2 100644
--- a/hosts/hosts.go
+++ b/hosts/hosts.go
@@ -4,7 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+
 	"github.com/docker/docker/client"
 	"github.com/rancher/rke/docker"
 	"github.com/rancher/rke/k8s"
@@ -29,6 +31,7 @@ type Host struct {
 	ToDelLabels         map[string]string
 	ToAddTaints         []string
 	ToDelTaints         []string
+	DockerInfo          types.Info
 }
 
 const (
diff --git a/hosts/tunnel.go b/hosts/tunnel.go
index 46ff46d9..859ab829 100644
--- a/hosts/tunnel.go
+++ b/hosts/tunnel.go
@@ -60,6 +60,7 @@ func checkDockerVersion(ctx context.Context, h *Host) error {
 		return fmt.Errorf("Can't retrieve Docker Info: %v", err)
 	}
 	logrus.Debugf("Docker Info found: %#v", info)
+	h.DockerInfo = info
 	isvalid, err := docker.IsSupportedDockerVersion(info, K8sVersion)
 	if err != nil {
 		return fmt.Errorf("Error while determining supported Docker version [%s]: %v", info.ServerVersion, err)