Skip to content

Commit 679a627

Browse files
authored
Merge pull request moby#3765 from sipsma/exit-4294967295
Fixes for containers exiting with code 4294967295
2 parents 3e4c5c9 + 9b0bdb6 commit 679a627

File tree

18 files changed

+268
-234
lines changed

18 files changed

+268
-234
lines changed

executor/runcexecutor/executor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func exitError(ctx context.Context, err error) error {
309309
Err: err,
310310
}
311311
var runcExitError *runc.ExitError
312-
if errors.As(err, &runcExitError) {
312+
if errors.As(err, &runcExitError) && runcExitError.Status >= 0 {
313313
exitErr = &gatewayapi.ExitError{
314314
ExitCode: uint32(runcExitError.Status),
315315
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/containerd/continuity v0.3.0
2020
github.com/containerd/fuse-overlayfs-snapshotter v1.0.2
2121
github.com/containerd/go-cni v1.1.9
22-
github.com/containerd/go-runc v1.0.0
22+
github.com/containerd/go-runc v1.0.1-0.20230316182144-f5d58d02d6c8
2323
github.com/containerd/nydus-snapshotter v0.3.1
2424
github.com/containerd/stargz-snapshotter v0.14.1
2525
github.com/containerd/stargz-snapshotter/estargz v0.14.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,8 @@ github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH
341341
github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
342342
github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g=
343343
github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
344-
github.com/containerd/go-runc v1.0.0 h1:oU+lLv1ULm5taqgV/CJivypVODI4SUz1znWjv3nNYS0=
345-
github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
344+
github.com/containerd/go-runc v1.0.1-0.20230316182144-f5d58d02d6c8 h1:PCkiJcIQIOyhwsVjN2AGZaItt+mKpw3sWsJB3eKmyyI=
345+
github.com/containerd/go-runc v1.0.1-0.20230316182144-f5d58d02d6c8/go.mod h1:3nyIw00YvKyqQHpVTwj21SepIlzVs2cYLEwJZdqQjwY=
346346
github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0=
347347
github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA=
348348
github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow=

vendor/github.com/containerd/go-runc/.golangci.yml

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

vendor/github.com/containerd/go-runc/.travis.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

vendor/github.com/containerd/go-runc/README.md

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

vendor/github.com/containerd/go-runc/command_other.go

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

vendor/github.com/containerd/go-runc/console.go

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

vendor/github.com/containerd/go-runc/events.go

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

vendor/github.com/containerd/go-runc/io.go

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

0 commit comments

Comments
 (0)