diff --git a/api/client/service/opts.go b/api/client/service/opts.go index 2b963d4fc1..b2465977c5 100644 --- a/api/client/service/opts.go +++ b/api/client/service/opts.go @@ -476,7 +476,7 @@ func addServiceFlags(cmd *cobra.Command, opts *serviceOptions) { flags.Var(&opts.replicas, flagReplicas, "Number of tasks") - flags.StringVar(&opts.restartPolicy.condition, flagRestartCondition, "", "Restart when condition is met (none, on_failure, or any)") + flags.StringVar(&opts.restartPolicy.condition, flagRestartCondition, "", "Restart when condition is met (none, on-failure, or any)") flags.Var(&opts.restartPolicy.delay, flagRestartDelay, "Delay between restart attempts") flags.Var(&opts.restartPolicy.maxAttempts, flagRestartMaxAttempts, "Maximum number of restarts before giving up") flags.Var(&opts.restartPolicy.window, flagRestartWindow, "Window used to evaluate the restart policy") diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 7c8f6db1b3..6d58ddd9ce 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1701,7 +1701,7 @@ _docker_service_update() { return ;; --restart-condition) - COMPREPLY=( $( compgen -W "any none on_failure" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "any none on-failure" -- "$cur" ) ) return ;; --user|-u) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 8c7db42080..f833206c80 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -1079,7 +1079,7 @@ __docker_service_subcommand() { "($help)--replicas=[Number of tasks]:replicas: " "($help)--reserve-cpu=[Reserve CPUs]:value: " "($help)--reserve-memory=[Reserve Memory]:value: " - "($help)--restart-condition=[Restart when condition is met]:mode:(any none on_failure)" + "($help)--restart-condition=[Restart when condition is met]:mode:(any none on-failure)" "($help)--restart-delay=[Delay between restart attempts]:delay: " "($help)--restart-max-attempts=[Maximum number of restarts before giving up]:max-attempts: " "($help)--restart-window=[Window used to evaluate the restart policy]:window: " diff --git a/daemon/cluster/convert/service.go b/daemon/cluster/convert/service.go index 60df93a59e..912d601354 100644 --- a/daemon/cluster/convert/service.go +++ b/daemon/cluster/convert/service.go @@ -219,7 +219,8 @@ func restartPolicyToGRPC(p *types.RestartPolicy) (*swarmapi.RestartPolicy, error var rp *swarmapi.RestartPolicy if p != nil { rp = &swarmapi.RestartPolicy{} - if condition, ok := swarmapi.RestartPolicy_RestartCondition_value[strings.ToUpper(string(p.Condition))]; ok { + sanatizedCondition := strings.ToUpper(strings.Replace(string(p.Condition), "-", "_", -1)) + if condition, ok := swarmapi.RestartPolicy_RestartCondition_value[sanatizedCondition]; ok { rp.Condition = swarmapi.RestartPolicy_RestartCondition(condition) } else if string(p.Condition) == "" { rp.Condition = swarmapi.RestartOnAny diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md index 22fa5f3921..dd94dadcb7 100644 --- a/docs/reference/api/docker_remote_api_v1.24.md +++ b/docs/reference/api/docker_remote_api_v1.24.md @@ -4007,7 +4007,7 @@ JSON Parameters: - **Memory** – Memory reservation - **RestartPolicy** – Specification for the restart policy which applies to containers created as part of this service. - - **Condition** – Condition for restart (`none`, `on_failure`, or `any`). + - **Condition** – Condition for restart (`none`, `on-failure`, or `any`). - **Delay** – Delay between restart attempts. - **Attempts** – Maximum attempts to restart a given container before giving up (default value is 0, which is ignored). @@ -4225,7 +4225,7 @@ Update the service `id`. - **Memory** – Memory reservation - **RestartPolicy** – Specification for the restart policy which applies to containers created as part of this service. - - **Condition** – Condition for restart (`none`, `on_failure`, or `any`). + - **Condition** – Condition for restart (`none`, `on-failure`, or `any`). - **Delay** – Delay between restart attempts. - **Attempts** – Maximum attempts to restart a given container before giving up (default value is 0, which is ignored). diff --git a/docs/reference/api/docker_remote_api_v1.25.md b/docs/reference/api/docker_remote_api_v1.25.md index 41970efb06..e701244881 100644 --- a/docs/reference/api/docker_remote_api_v1.25.md +++ b/docs/reference/api/docker_remote_api_v1.25.md @@ -4008,7 +4008,7 @@ JSON Parameters: - **Memory** – Memory reservation - **RestartPolicy** – Specification for the restart policy which applies to containers created as part of this service. - - **Condition** – Condition for restart (`none`, `on_failure`, or `any`). + - **Condition** – Condition for restart (`none`, `on-failure`, or `any`). - **Delay** – Delay between restart attempts. - **Attempts** – Maximum attempts to restart a given container before giving up (default value is 0, which is ignored). @@ -4226,7 +4226,7 @@ Update the service `id`. - **Memory** – Memory reservation - **RestartPolicy** – Specification for the restart policy which applies to containers created as part of this service. - - **Condition** – Condition for restart (`none`, `on_failure`, or `any`). + - **Condition** – Condition for restart (`none`, `on-failure`, or `any`). - **Delay** – Delay between restart attempts. - **Attempts** – Maximum attempts to restart a given container before giving up (default value is 0, which is ignored). diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index 7d3b136689..10f4aefd7c 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -32,7 +32,7 @@ Options: --replicas value Number of tasks (default none) --reserve-cpu value Reserve CPUs (default 0.000) --reserve-memory value Reserve Memory (default 0 B) - --restart-condition string Restart when condition is met (none, on_failure, or any) + --restart-condition string Restart when condition is met (none, on-failure, or any) --restart-delay value Delay between restart attempts (default none) --restart-max-attempts value Maximum number of restarts before giving up (default none) --restart-window value Window used to evaluate the restart policy (default none) diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md index f16f7f3efe..c0da447c1e 100644 --- a/docs/reference/commandline/service_update.md +++ b/docs/reference/commandline/service_update.md @@ -35,7 +35,7 @@ Options: --replicas value Number of tasks (default none) --reserve-cpu value Reserve CPUs (default 0.000) --reserve-memory value Reserve Memory (default 0 B) - --restart-condition string Restart when condition is met (none, on_failure, or any) + --restart-condition string Restart when condition is met (none, on-failure, or any) --restart-delay value Delay between restart attempts (default none) --restart-max-attempts value Maximum number of restarts before giving up (default none) --restart-window value Window used to evaluate the restart policy (default none) diff --git a/vendor/src/github.com/docker/engine-api/types/swarm/task.go b/vendor/src/github.com/docker/engine-api/types/swarm/task.go index 5e5087f781..fa8228a497 100644 --- a/vendor/src/github.com/docker/engine-api/types/swarm/task.go +++ b/vendor/src/github.com/docker/engine-api/types/swarm/task.go @@ -93,7 +93,7 @@ const ( // RestartPolicyConditionNone NONE RestartPolicyConditionNone RestartPolicyCondition = "none" // RestartPolicyConditionOnFailure ON_FAILURE - RestartPolicyConditionOnFailure RestartPolicyCondition = "on_failure" + RestartPolicyConditionOnFailure RestartPolicyCondition = "on-failure" // RestartPolicyConditionAny ANY RestartPolicyConditionAny RestartPolicyCondition = "any" )