Merge pull request #5758 from rhatdan/exitcode

Set exit codes on errors.
This commit is contained in:
OpenShift Merge Robot
2020-04-09 03:02:55 +02:00
committed by GitHub

View File

@ -109,13 +109,14 @@ func run(cmd *cobra.Command, args []string) error {
} }
runOpts.Spec = s runOpts.Spec = s
report, err := registry.ContainerEngine().ContainerRun(registry.GetContext(), runOpts) report, err := registry.ContainerEngine().ContainerRun(registry.GetContext(), runOpts)
// report.ExitCode is set by ContainerRun even it it returns an error
registry.SetExitCode(report.ExitCode)
if err != nil { if err != nil {
return err return err
} }
if cliVals.Detach { if cliVals.Detach {
fmt.Println(report.Id) fmt.Println(report.Id)
} }
registry.SetExitCode(report.ExitCode)
if runRmi { if runRmi {
_, err := registry.ImageEngine().Delete(registry.GetContext(), []string{report.Id}, entities.ImageDeleteOptions{}) _, err := registry.ImageEngine().Delete(registry.GetContext(), []string{report.Id}, entities.ImageDeleteOptions{})
if err != nil { if err != nil {