Skip to content

Commit

Permalink
Merge pull request #19854 from giuseppe/bump-runc-to-main
Browse files Browse the repository at this point in the history
vendor: update github.com/opencontainers/runc to main
  • Loading branch information
openshift-merge-robot authored Sep 4, 2023
2 parents 9bcab49 + 9730c03 commit 203c2b8
Show file tree
Hide file tree
Showing 32 changed files with 524 additions and 228 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ require (
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc4
github.com/opencontainers/runc v1.1.9
github.com/opencontainers/runtime-spec v1.1.0
github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4
github.com/opencontainers/runtime-tools v0.9.1-0.20230317050512-e931285f4b69
github.com/opencontainers/selinux v1.11.0
github.com/openshift/imagebuilder v1.2.5
Expand Down Expand Up @@ -196,4 +196,4 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
)

replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.1-0.20220617142545-8b9452f75cbc
replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.1-0.20230904132852-a0466dd76f23
43 changes: 30 additions & 13 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions vendor/github.com/opencontainers/runc/NOTICE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 17 additions & 16 deletions vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 203c2b8

Please sign in to comment.