Merge pull request #2434 from giuseppe/no-kill-error

linux: skip errors from the runtime kill
containers · Jul 14, 2020 · d2e0cd8 · d2e0cd8
2 parents 0bad47c + ddf7f01
commit d2e0cd8
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/run_linux.go b/run_linux.go
@@ -841,13 +841,8 @@ func runUsingRuntime(isolation Isolation, options RunOptions, configureNetwork b
 	stopped := false
 	defer func() {
 		if !stopped {
-			err2 := kill.Run()
-			if err2 != nil {
-				if err == nil {
-					err = errors.Wrapf(err2, "error stopping container")
-				} else {
-					logrus.Infof("error stopping container: %v", err2)
-				}
+			if err2 := kill.Run(); err2 != nil {
+				logrus.Infof("error stopping container: %v", err2)
 			}
 		}
 	}()