kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't set docker.socket on RHEL 

For Docker >= 1.12

Fix #1781
This commit is contained in:
Justin Santa Barbara 2017-02-05 15:17:14 -05:00
parent f2445e1923
commit 46a770bf43
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nodeup/pkg/model/docker.go
View File

@ -302,6 +302,11 @@ func (b *DockerBuilder) buildSystemdService(dockerVersion semver.Version) *nodet
manifest.Set("Unit", "Description", "Docker Application Container Engine")
manifest.Set("Unit", "Documentation", "https://docs.docker.com")
if b.Distribution.IsRHELFamily() && !oldDocker {
// See https://github.com/docker/docker/pull/24804
usesDockerSocket = false
}
if usesDockerSocket {
manifest.Set("Unit", "After", "network.target docker.socket")
manifest.Set("Unit", "Requires", "docker.socket")