Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Send warnings to stderr. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-11-02 12:19:37 -04:00
parent 25c93d4ebb
commit ae8f001829
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/stack/deploy.go
View File

@ -73,13 +73,13 @@ func runDeploy(dockerCli *command.DockerCli, opts deployOptions) error {
unsupportedProperties := loader.GetUnsupportedProperties(configDetails) unsupportedProperties := loader.GetUnsupportedProperties(configDetails)
if len(unsupportedProperties) > 0 { if len(unsupportedProperties) > 0 {
fmt.Printf("Ignoring unsupported options: %s\n\n", fmt.Fprintf(dockerCli.Err(), "Ignoring unsupported options: %s\n\n",
strings.Join(unsupportedProperties, ", ")) strings.Join(unsupportedProperties, ", "))
} }
deprecatedProperties := loader.GetDeprecatedProperties(configDetails) deprecatedProperties := loader.GetDeprecatedProperties(configDetails)
if len(deprecatedProperties) > 0 { if len(deprecatedProperties) > 0 {
fmt.Printf("Ignoring deprecated options:\n\n%s\n\n", fmt.Fprintf(dockerCli.Err(), "Ignoring deprecated options:\n\n%s\n\n",
propertyWarnings(deprecatedProperties)) propertyWarnings(deprecatedProperties))
} }
@ -434,11 +434,10 @@ func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*
}, nil }, nil
} }
} }
attempts := uint64(*source.MaxAttempts)
return &swarm.RestartPolicy{ return &swarm.RestartPolicy{
Condition: swarm.RestartPolicyCondition(source.Condition), Condition: swarm.RestartPolicyCondition(source.Condition),
Delay: source.Delay, Delay: source.Delay,
MaxAttempts: &attempts, MaxAttempts: source.MaxAttempts,
Window: source.Window, Window: source.Window,
}, nil }, nil
} }