Skip to content

Commit c281e69

Browse files
committed
vendor: test new common and buildah
vendor the following dependencies: - containers/common#2375 - containers/buildah#6074 Closes: #25634 Signed-off-by: Giuseppe Scrivano <[email protected]>
1 parent 2b0aef5 commit c281e69

File tree

171 files changed

+15216
-3060
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+15216
-3060
lines changed

go.mod

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ require (
1212
github.com/buger/goterm v1.0.4
1313
github.com/checkpoint-restore/checkpointctl v1.3.0
1414
github.com/checkpoint-restore/go-criu/v7 v7.2.0
15-
github.com/containernetworking/plugins v1.5.1
15+
github.com/containernetworking/plugins v1.6.2
1616
github.com/containers/buildah v1.39.2
17-
github.com/containers/common v0.62.2-0.20250311121556-b27979403716
17+
github.com/containers/common v0.62.2
1818
github.com/containers/conmon v2.0.20+incompatible
1919
github.com/containers/gvisor-tap-vsock v0.8.4
20-
github.com/containers/image/v5 v5.34.2-0.20250306154130-12497efe55ac
20+
github.com/containers/image/v5 v5.34.3-0.20250311194052-d84dbab374e7
2121
github.com/containers/libhvee v0.10.0
2222
github.com/containers/ocicrypt v1.2.1
2323
github.com/containers/psgo v1.9.0
@@ -53,15 +53,15 @@ require (
5353
github.com/moby/sys/user v0.3.0
5454
github.com/moby/term v0.5.2
5555
github.com/nxadm/tail v1.4.11
56-
github.com/onsi/ginkgo/v2 v2.22.2
56+
github.com/onsi/ginkgo/v2 v2.23.0
5757
github.com/onsi/gomega v1.36.2
5858
github.com/opencontainers/go-digest v1.0.0
5959
github.com/opencontainers/image-spec v1.1.1
6060
github.com/opencontainers/runc v1.2.6
6161
github.com/opencontainers/runtime-spec v1.2.1
6262
github.com/opencontainers/runtime-tools v0.9.1-0.20241108202711-f7e3563b0271
6363
github.com/opencontainers/selinux v1.11.1
64-
github.com/openshift/imagebuilder v1.2.15
64+
github.com/openshift/imagebuilder v1.2.16-0.20250220150830-7ebfb09d364e
6565
github.com/rootless-containers/rootlesskit/v2 v2.3.2
6666
github.com/shirou/gopsutil/v4 v4.25.2
6767
github.com/sirupsen/logrus v1.9.3
@@ -70,7 +70,7 @@ require (
7070
github.com/stretchr/testify v1.10.0
7171
github.com/vbauerster/mpb/v8 v8.9.3
7272
github.com/vishvananda/netlink v1.3.1-0.20250221194427-0af32151e72b
73-
go.etcd.io/bbolt v1.3.11
73+
go.etcd.io/bbolt v1.4.0
7474
golang.org/x/crypto v0.36.0
7575
golang.org/x/net v0.37.0
7676
golang.org/x/sync v0.12.0
@@ -81,7 +81,7 @@ require (
8181
gopkg.in/inf.v0 v0.9.1
8282
gopkg.in/yaml.v3 v3.0.1
8383
sigs.k8s.io/yaml v1.4.0
84-
tags.cncf.io/container-device-interface v0.8.1
84+
tags.cncf.io/container-device-interface v1.0.0
8585
)
8686

8787
require (
@@ -106,7 +106,7 @@ require (
106106
github.com/containerd/typeurl/v2 v2.2.3 // indirect
107107
github.com/containernetworking/cni v1.2.3 // indirect
108108
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
109-
github.com/containers/luksy v0.0.0-20250106202729-a3a812db5b72 // indirect
109+
github.com/containers/luksy v0.0.0-20250217190002-40bd943d93b8 // indirect
110110
github.com/coreos/go-oidc/v3 v3.12.0 // indirect
111111
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
112112
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
@@ -166,11 +166,11 @@ require (
166166
github.com/mattn/go-colorable v0.1.13 // indirect
167167
github.com/mattn/go-isatty v0.0.20 // indirect
168168
github.com/mattn/go-runewidth v0.0.16 // indirect
169-
github.com/mdlayher/socket v0.5.0 // indirect
169+
github.com/mdlayher/socket v0.5.1 // indirect
170170
github.com/miekg/pkcs11 v1.1.1 // indirect
171171
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
172172
github.com/mitchellh/mapstructure v1.5.0 // indirect
173-
github.com/moby/buildkit v0.19.0 // indirect
173+
github.com/moby/buildkit v0.20.1 // indirect
174174
github.com/moby/docker-image-spec v1.3.1 // indirect
175175
github.com/moby/patternmatcher v0.6.0 // indirect
176176
github.com/moby/sys/mountinfo v0.7.2 // indirect
@@ -184,7 +184,7 @@ require (
184184
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
185185
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
186186
github.com/pkg/errors v0.9.1 // indirect
187-
github.com/pkg/sftp v1.13.7 // indirect
187+
github.com/pkg/sftp v1.13.8 // indirect
188188
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
189189
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
190190
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
@@ -212,7 +212,7 @@ require (
212212
github.com/ugorji/go/codec v1.2.12 // indirect
213213
github.com/ulikunitz/xz v0.5.12 // indirect
214214
github.com/vbatts/tar-split v0.12.1 // indirect
215-
github.com/vishvananda/netns v0.0.4 // indirect
215+
github.com/vishvananda/netns v0.0.5 // indirect
216216
github.com/yusufpapurcu/wmi v1.2.4 // indirect
217217
go.mongodb.org/mongo-driver v1.14.0 // indirect
218218
go.opencensus.io v0.24.0 // indirect
@@ -222,14 +222,19 @@ require (
222222
go.opentelemetry.io/otel/trace v1.32.0 // indirect
223223
golang.org/x/arch v0.8.0 // indirect
224224
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
225-
golang.org/x/mod v0.22.0 // indirect
225+
golang.org/x/mod v0.23.0 // indirect
226226
golang.org/x/oauth2 v0.26.0 // indirect
227227
golang.org/x/time v0.9.0 // indirect
228-
golang.org/x/tools v0.29.0 // indirect
228+
golang.org/x/tools v0.30.0 // indirect
229229
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
230230
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
231231
google.golang.org/grpc v1.70.0 // indirect
232232
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
233233
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
234-
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
234+
gopkg.in/yaml.v2 v2.4.0 // indirect
235+
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
235236
)
237+
238+
replace github.com/containers/common => github.com/giuseppe/common v0.0.8-0.20250320112300-d1bf3f3b14cf
239+
240+
replace github.com/containers/buildah => github.com/giuseppe/buildah v0.0.0-20250320132707-0e11a5d046fd

0 commit comments

Comments
 (0)