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

Merge pull request #2716 from dweomer/swarm-provisioning-fix-restart-policy-2715 

fix swarm provision issue #2715: invalid restart policy
This commit is contained in:
Jean-Laurent de Morlhon 2016-01-04 10:24:24 +01:00
parent c115e037da 94329a6e06
commit e2c4801a93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmachine/provision/configure_swarm.go
View File

@ -62,7 +62,7 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
hostBind := fmt.Sprintf("%s:%s", dockerDir, dockerDir) hostBind := fmt.Sprintf("%s:%s", dockerDir, dockerDir)
masterHostConfig := dockerclient.HostConfig{ masterHostConfig := dockerclient.HostConfig{
RestartPolicy: dockerclient.RestartPolicy{ RestartPolicy: dockerclient.RestartPolicy{
Name: "Always", Name: "always",
MaximumRetryCount: 0, MaximumRetryCount: 0,
}, },
Binds: []string{hostBind}, Binds: []string{hostBind},
@ -89,7 +89,7 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
workerHostConfig := dockerclient.HostConfig{ workerHostConfig := dockerclient.HostConfig{
RestartPolicy: dockerclient.RestartPolicy{ RestartPolicy: dockerclient.RestartPolicy{
Name: "Always", Name: "always",
MaximumRetryCount: 0, MaximumRetryCount: 0,
}, },
NetworkMode: "host", NetworkMode: "host",