瀏覽代碼

Move list of run specific flags where it’s used

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 5 年之前
父節點
當前提交
cfa090459b
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 0 3
      api/containers/api.go
  2. 4 1
      cli/options/run/opts.go

+ 0 - 3
api/containers/api.go

@@ -39,9 +39,6 @@ const (
 	RestartPolicyRunAlways = "always"
 )
 
-// RestartPolicyList all available restart policy values
-var RestartPolicyList = []string{RestartPolicyRunNo, RestartPolicyRunAlways, RestartPolicyOnFailure}
-
 // Container represents a created container
 type Container struct {
 	ID          string

+ 4 - 1
cli/options/run/opts.go

@@ -53,6 +53,9 @@ type Opts struct {
 	HealthTimeout          time.Duration
 }
 
+// RestartPolicyList all available restart policy values
+var RestartPolicyList = []string{containers.RestartPolicyRunNo, containers.RestartPolicyRunAlways, containers.RestartPolicyOnFailure}
+
 // ToContainerConfig convert run options to a container configuration
 func (r *Opts) ToContainerConfig(image string) (containers.ContainerConfig, error) {
 	if r.Name == "" {
@@ -124,7 +127,7 @@ var restartPolicyMap = map[string]string{
 func toRestartPolicy(value string) (string, error) {
 	value, ok := restartPolicyMap[value]
 	if !ok {
-		return "", fmt.Errorf("invalid restart value, must be one of %s", strings.Join(containers.RestartPolicyList, ", "))
+		return "", fmt.Errorf("invalid restart value, must be one of %s", strings.Join(RestartPolicyList, ", "))
 	}
 	return value, nil
 }