Skip to content

Commit

Permalink
vendor: drop override for github.com/opencontainers/runc
Browse files Browse the repository at this point in the history
podman builds fine with the latest runc, so we can drop the override.

Closes: #19795

Signed-off-by: Giuseppe Scrivano <[email protected]>
  • Loading branch information
giuseppe committed Sep 1, 2023
1 parent ab579a9 commit bf8fc65
Show file tree
Hide file tree
Showing 34 changed files with 534 additions and 260 deletions.
8 changes: 4 additions & 4 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 All @@ -62,7 +62,7 @@ require (
github.com/vbauerster/mpb/v8 v8.6.0
github.com/vishvananda/netlink v1.2.1-beta.2
go.etcd.io/bbolt v1.3.7
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
golang.org/x/net v0.14.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.11.0
Expand Down Expand Up @@ -187,7 +187,7 @@ require (
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
golang.org/x/tools v0.12.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.56.2 // indirect
Expand All @@ -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.20230901174540-8feecba2bb29
48 changes: 31 additions & 17 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 bf8fc65

Please sign in to comment.