Merge branch 'refactor/restart-policy' into 'master'

cannot use MaximumRetryCount with restart:always See merge request !100
projecteru2 · Jun 19, 2017 · f446ea1 · f446ea1
2 parents 129cd7c + bb20b47
commit f446ea1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.32
+0.7.33
diff --git a/cluster/calcium/create_container.go b/cluster/calcium/create_container.go
@@ -683,12 +683,17 @@ func (c *calcium) makeContainerOptions(index int, quota map[string]int, specs ty
 		}
 	}
 
+	restartPolicy := entry.RestartPolicy
+	maximumRetryCount := 3
+	if restartPolicy == "always" {
+		maximumRetryCount = 0
+	}
 	hostConfig := &enginecontainer.HostConfig{
 		Binds:         binds,
 		DNS:           dns,
 		LogConfig:     logConfig,
 		NetworkMode:   enginecontainer.NetworkMode(networkMode),
-		RestartPolicy: enginecontainer.RestartPolicy{Name: entry.RestartPolicy, MaximumRetryCount: 3},
+		RestartPolicy: enginecontainer.RestartPolicy{Name: restartPolicy, MaximumRetryCount: maximumRetryCount},
 		CapAdd:        engineslice.StrSlice(capAdd),
 		ExtraHosts:    entry.ExtraHosts,
 		Privileged:    entry.Privileged != "",