Skip to content

Commit

Permalink
Merge pull request #3532 from justinsb/warn_if_no_docker_version
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

nodeup: warn if no docker version matched
  • Loading branch information
Kubernetes Submit Queue authored Oct 5, 2017
2 parents f3f4df7 + d835cb6 commit 51d3cde
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions nodeup/pkg/model/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -472,12 +472,15 @@ func (b *DockerBuilder) Build(c *fi.ModelBuilderContext) error {

// Add packages
{
count := 0
for i := range dockerVersions {
dv := &dockerVersions[i]
if !dv.matches(b.Architecture, dockerVersion, b.Distribution) {
continue
}

count++

c.AddTask(&nodetasks.Package{
Name: dv.Name,
Version: s(dv.Version),
Expand All @@ -494,6 +497,10 @@ func (b *DockerBuilder) Build(c *fi.ModelBuilderContext) error {

// Note we do _not_ stop looping... centos/rhel comprises multiple packages
}

if count == 0 {
glog.Warningf("Did not find docker package for %s %s %s", b.Distribution, b.Architecture, dockerVersion)
}
}

dockerSemver, err := semver.ParseTolerant(dockerVersion)
Expand Down

0 comments on commit 51d3cde

Please sign in to comment.