Skip to content

Commit f49d0c7

Browse files
committed
cluster up: warn on error parsing Docker version
The latest version of Docker for Mac/Windows uses the Community Edition versioning scheme. This causes 'cluster up' to halt with an error because the new version cannot be parsed by the 'semver' library. This commit changes the behavior to display a warning instead of exiting with an error.
1 parent d0d613e commit f49d0c7

File tree

1 file changed

+4
-2
lines changed
  • pkg/bootstrap/docker

1 file changed

+4
-2
lines changed

Diff for: pkg/bootstrap/docker/up.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,12 @@ func (c *CommonStartConfig) CheckNsenterMounter(out io.Writer) error {
608608

609609
// CheckDockerVersion checks that the appropriate Docker version is installed based on whether we are using the nsenter mounter
610610
// or shared volumes for OpenShift
611-
func (c *CommonStartConfig) CheckDockerVersion(io.Writer) error {
611+
func (c *CommonStartConfig) CheckDockerVersion(out io.Writer) error {
612612
ver, rh, err := c.DockerHelper().Version()
613613
if err != nil {
614-
return err
614+
glog.V(1).Infof("Failed to check Docker version: %v", err)
615+
fmt.Fprintf(out, "WARNING: Cannot verify Docker version\n")
616+
return nil
615617
}
616618
needVersion := dockerVersion19
617619
if !rh {

0 commit comments

Comments
 (0)