From cfa090459bd8772f288ef35f7f9824378021787c Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Fri, 6 Nov 2020 15:38:50 +0100 Subject: [PATCH] =?UTF-8?q?Move=20list=20of=20run=20specific=20flags=20whe?= =?UTF-8?q?re=20it=E2=80=99s=20used?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillaume Tardif --- api/containers/api.go | 3 --- cli/options/run/opts.go | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/containers/api.go b/api/containers/api.go index 433cac00..3a3e94fd 100644 --- a/api/containers/api.go +++ b/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 diff --git a/cli/options/run/opts.go b/cli/options/run/opts.go index 0bd2c1ae..eaca7a2e 100644 --- a/cli/options/run/opts.go +++ b/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 }