Skip to content

Commit 951d0fb

Browse files
author
OpenShift Bot
authored
Merge pull request #13204 from csrwng/docker_version_warning_15
Merged by openshift-bot
2 parents 90fb864 + f49d0c7 commit 951d0fb

File tree

1 file changed

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

1 file changed

+4
-2
lines changed

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)