Skip to content

Commit 0bb672d

Browse files
Merge pull request #2864 from thaJeztah/1.1_backport_runc-kill-paused
[release/1.1 backport] Update runc to 96ec2177ae841256168fcf76954f7177af
2 parents dbf186d + a1bfd3a commit 0bb672d

4 files changed

Lines changed: 12 additions & 11 deletions

File tree

linux/proc/utils.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ func checkKillError(err error) error {
9393
if err == nil {
9494
return nil
9595
}
96-
if strings.Contains(err.Error(), "os: process already finished") || err == unix.ESRCH {
96+
if strings.Contains(err.Error(), "os: process already finished") ||
97+
strings.Contains(err.Error(), "container not running") ||
98+
err == unix.ESRCH {
9799
return errors.Wrapf(errdefs.ErrNotFound, "process already finished")
98100
}
99101
return errors.Wrapf(err, "unknown error after kill")

vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ github.com/gogo/protobuf v1.0.0
2020
github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
2121
github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9
2222
github.com/opencontainers/runtime-spec v1.0.1
23-
github.com/opencontainers/runc 10d38b660a77168360df3522881e2dc2be5056bd
23+
github.com/opencontainers/runc 96ec2177ae841256168fcf76954f7177af9446eb
2424
github.com/sirupsen/logrus v1.0.0
2525
github.com/pmezard/go-difflib v1.0.0
2626
github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c

vendor/github.com/opencontainers/runc/libcontainer/configs/config.go

Lines changed: 5 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/opencontainers/runc/libcontainer/configs/intelrdt.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)