Merge pull request #13204 from csrwng/docker_version_warning_15

Merged by openshift-bot
openshift · Mar 3, 2017 · 951d0fb · 951d0fb
2 parents 90fb864 + f49d0c7
commit 951d0fb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/bootstrap/docker/up.go b/pkg/bootstrap/docker/up.go
@@ -608,10 +608,12 @@ func (c *CommonStartConfig) CheckNsenterMounter(out io.Writer) error {
 
 // CheckDockerVersion checks that the appropriate Docker version is installed based on whether we are using the nsenter mounter
 // or shared volumes for OpenShift
-func (c *CommonStartConfig) CheckDockerVersion(io.Writer) error {
+func (c *CommonStartConfig) CheckDockerVersion(out io.Writer) error {
 	ver, rh, err := c.DockerHelper().Version()
 	if err != nil {
-		return err
+		glog.V(1).Infof("Failed to check Docker version: %v", err)
+		fmt.Fprintf(out, "WARNING: Cannot verify Docker version\n")
+		return nil
 	}
 	needVersion := dockerVersion19
 	if !rh {