Skip to content

Commit

Permalink
Merge pull request #44199 from supereagle/update-docker-version-parser
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

update docker version parser for its new versioning scheme

**What this PR does / why we need it**:
Docker has change its release strategy and versioning scheme from [v17.03.0-ce-rc1](https://github.com/docker/docker/releases/tag/v17.03.0-ce-rc1). We need to update the version verify condition to satisfy the new docker versions.

**Which issue this PR fixes** : fixes #44140

**Special notes for your reviewer**:

**Release note**:

```
NONE
```
  • Loading branch information
Kubernetes Submit Queue committed Apr 8, 2017
2 parents 6702985 + b98c363 commit 97f9b71
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/kubelet/dockershim/cm/container_manager_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (m *containerManager) doWork() {
glog.Errorf("Unable to get docker version: %v", err)
return
}
version, err := utilversion.ParseSemantic(v.Version)
version, err := utilversion.ParseGeneric(v.Version)
if err != nil {
glog.Errorf("Unable to parse docker version %q: %v", v.Version, err)
return
Expand Down

0 comments on commit 97f9b71

Please sign in to comment.