p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Send warnings to stderr.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b0efbcc34a77d5d8869cc381064d3741b67f9776
Component: engine
This commit is contained in:
Daniel Nephin
2016-11-02 12:19:37 -04:00
parent 787c19b18c
commit 1908145b38
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/cli/command/stack/deploy.go
View File

@ -73,13 +73,13 @@ func runDeploy(dockerCli *command.DockerCli, opts deployOptions) error {
unsupportedProperties := loader.GetUnsupportedProperties(configDetails)
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, ", "))
}
deprecatedProperties := loader.GetDeprecatedProperties(configDetails)
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))
}
@ -434,11 +434,10 @@ func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*
}, nil
}
}
attempts := uint64(*source.MaxAttempts)
return &swarm.RestartPolicy{
Condition: swarm.RestartPolicyCondition(source.Condition),
Delay: source.Delay,
MaxAttempts: &attempts,
MaxAttempts: source.MaxAttempts,
Window: source.Window,
}, nil
}