redefine restart and keep backward compatible (#345)

Author: CMGS

engine/docker/container.go

@@ -30,10 +30,9 @@ import (
 )
 
 const (
-	minMemory     = units.MiB * 4
-	maxMemory     = math.MaxInt64
-	restartAlways = "always"
-	root          = "root"
+	minMemory = units.MiB * 4
+	maxMemory = math.MaxInt64
+	root      = "root"
 )
 
 type rawArgs struct {
@@ -57,11 +56,10 @@ func (e *Engine) VirtualizationCreate(ctx context.Context, opts *enginetypes.Vir
 
 	restartPolicy := ""
 	restartRetry := 0
-	if opts.Restart == -1 || opts.Restart > 0 {
-		restartPolicy = restartAlways
-	}
-	if opts.Restart > 0 {
-		restartRetry = opts.Restart
+	restartStr := strings.Split(opts.Restart, ":")
+	restartPolicy = restartStr[0]
+	if r, err := strconv.Atoi(restartStr[len(restartStr)-1]); err == nil {
+		restartRetry = r
 	}
 	// no longer use opts.Network as networkmode
 	// always get network name from networks

engine/systemd/unit.go

@@ -216,11 +216,14 @@ func (b *unitBuilder) buffer() (*bytes.Buffer, error) {
 	return bytes.NewBufferString(unit), b.err
 }
 
-func (b *unitBuilder) convertToSystemdRestartPolicy(restart int) (policy string) {
-	if restart == 0 {
-		return "no"
-	}
-	return "always"
+func (b *unitBuilder) convertToSystemdRestartPolicy(restart string) (policy string) {
+	switch {
+	case strings.HasPrefix(restart, "always"):
+		return "always"
+	case strings.HasPrefix(restart, "on-failure"):
+		return "on-failure"
+	}
+	return "no"
 }
 
 func (b *unitBuilder) convertToSystemdStdio(logType string) (stdioType string, err error) {

engine/types/virtualization.go

@@ -30,7 +30,7 @@ type VirtualizationCreateOptions struct {
 	Labels     map[string]string
 
 	Debug   bool
-	Restart int
+	Restart string
 
 	Networks map[string]string
 

rpc/gen/core.pb.go

@@ -382,7 +382,7 @@ message EntrypointOptions {
     repeated string publish = 6;
     HealthCheckOptions healthcheck = 7;
     HookOptions hook = 8;
-    int32 restart = 9;
+    string restart = 9;
     map<string, string> sysctls = 10;
 }
 

rpc/gen/core.proto

@@ -237,7 +237,7 @@ func toCoreDeployOptions(d *pb.DeployOptions) (*types.DeployOptions, error) {
 		Privileged: entrypoint.Privileged,
 		Dir:        entrypoint.Dir,
 		Publish:    entrypoint.Publish,
-		Restart:    int(entrypoint.Restart),
+		Restart:    entrypoint.Restart,
 		Sysctls:    entrypoint.Sysctls,
 	}
 

rpc/transform.go

@@ -29,7 +29,7 @@ type Entrypoint struct {
 	Publish     []string          `yaml:"publish,omitempty,flow"`
 	HealthCheck *HealthCheck      `yaml:"healthcheck,omitempty,flow"`
 	Hook        *Hook             `yaml:"hook,omitempty,flow"`
-	Restart     int               `yaml:"restart,omitempty"`
+	Restart     string            `yaml:"restart,omitempty"`
 	Sysctls     map[string]string `yaml:"sysctls,omitempty,flow"`
 }