From 73e56b0fbbdb23133cf0283c43e5fabfa25d12fc Mon Sep 17 00:00:00 2001
From: Bill Maxwell <bill@rancher.com>
Date: Tue, 15 May 2018 10:35:52 -0700
Subject: [PATCH] Added flag to ignore docker version

---
 cmd/common.go | 11 ++++++++++-
 cmd/etcd.go   |  2 +-
 cmd/remove.go |  2 +-
 cmd/up.go     |  5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/cmd/common.go b/cmd/common.go
index 80e6a1e0..7585db94 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -10,11 +10,15 @@ import (
 	"github.com/urfave/cli"
 )
 
-var sshCliOptions = []cli.Flag{
+var commonFlags = []cli.Flag{
 	cli.BoolFlag{
 		Name:  "ssh-agent-auth",
 		Usage: "Use SSH Agent Auth defined by SSH_AUTH_SOCK",
 	},
+	cli.BoolFlag{
+		Name:  "ignore-docker-version",
+		Usage: "Disable Docker version check",
+	},
 }
 
 func resolveClusterFile(ctx *cli.Context) (string, string, error) {
@@ -41,5 +45,10 @@ func setOptionsFromCLI(c *cli.Context, rkeConfig *v3.RancherKubernetesEngineConf
 	if c.Bool("ssh-agent-auth") {
 		rkeConfig.SSHAgentAuth = c.Bool("ssh-agent-auth")
 	}
+
+	if c.Bool("ignore-docker-version") {
+		rkeConfig.IgnoreDockerVersion = c.Bool("ignore-docker-version")
+	}
+
 	return rkeConfig, nil
 }
diff --git a/cmd/etcd.go b/cmd/etcd.go
index 520529a0..853d2815 100644
--- a/cmd/etcd.go
+++ b/cmd/etcd.go
@@ -26,7 +26,7 @@ func EtcdCommand() cli.Command {
 		},
 	}
 
-	backupRestoreFlags = append(backupRestoreFlags, sshCliOptions...)
+	backupRestoreFlags = append(backupRestoreFlags, commonFlags...)
 
 	return cli.Command{
 		Name:  "etcd",
diff --git a/cmd/remove.go b/cmd/remove.go
index 4ac38b8b..71c23f7a 100644
--- a/cmd/remove.go
+++ b/cmd/remove.go
@@ -35,7 +35,7 @@ func RemoveCommand() cli.Command {
 		},
 	}
 
-	removeFlags = append(removeFlags, sshCliOptions...)
+	removeFlags = append(removeFlags, commonFlags...)
 
 	return cli.Command{
 		Name:   "remove",
diff --git a/cmd/up.go b/cmd/up.go
index f2bee8cf..45025836 100644
--- a/cmd/up.go
+++ b/cmd/up.go
@@ -39,7 +39,7 @@ func UpCommand() cli.Command {
 		},
 	}
 
-	upFlags = append(upFlags, sshCliOptions...)
+	upFlags = append(upFlags, commonFlags...)
 
 	return cli.Command{
 		Name:   "up",
@@ -199,6 +199,9 @@ func clusterUpLocal(ctx *cli.Context) error {
 		}
 		rkeConfig.Nodes = []v3.RKEConfigNode{*cluster.GetLocalRKENodeConfig()}
 	}
+
+	rkeConfig.IgnoreDockerVersion = ctx.Bool("ignore-docker-version")
+
 	_, _, _, _, _, err = ClusterUp(context.Background(), rkeConfig, nil, hosts.LocalHealthcheckFactory, nil, true, "", false, false)
 	return err
 }