Skip to content

[1.5] cluster up: warn on error parsing Docker version #13204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2017
Merged

[1.5] cluster up: warn on error parsing Docker version #13204

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/bootstrap/docker/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down