1 files changed, 24 insertions, 5 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index d02c54e76..30c4a8359 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -87,10 +87,25 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
 	}
 	for _, c := range ctrs {
 		report := entities.StopReport{Id: c.ID}
-		report.Err = containers.Stop(ic.ClientCxt, c.ID, &options.Timeout)
-		// TODO we need to associate errors returned by http with common
-		// define.errors so that we can equity tests. this will allow output
-		// to be the same as the native client
+		if err = containers.Stop(ic.ClientCxt, c.ID, &options.Timeout); err != nil {
+			// These first two are considered non-fatal under the right conditions
+			if errors.Cause(err).Error() == define.ErrCtrStopped.Error() {
+				logrus.Debugf("Container %s is already stopped", c.ID)
+				reports = append(reports, &report)
+				continue
+			} else if options.All && errors.Cause(err).Error() == define.ErrCtrStateInvalid.Error() {
+				logrus.Debugf("Container %s is not running, could not stop", c.ID)
+				reports = append(reports, &report)
+				continue
+			}
+
+			// TODO we need to associate errors returned by http with common
+			// define.errors so that we can equity tests. this will allow output
+			// to be the same as the native client
+			report.Err = err
+			reports = append(reports, &report)
+			continue
+		}
 		reports = append(reports, &report)
 	}
 	return reports, nil
@@ -357,7 +372,11 @@ func startAndAttach(ic *ContainerEngine, name string, detachKeys *string, input,
 func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []string, options entities.ContainerStartOptions) ([]*entities.ContainerStartReport, error) {
 	var reports []*entities.ContainerStartReport
 	for _, name := range namesOrIds {
-		report := entities.ContainerStartReport{Id: name}
+		report := entities.ContainerStartReport{
+			Id:       name,
+			RawInput: name,
+			ExitCode: 125,
+		}
 		if options.Attach {
 			report.Err = startAndAttach(ic, name, &options.DetachKeys, options.Stdin, options.Stdout, options.Stderr)
 			if report.Err == nil {