Skip to content

Commit 7dbf3ec

Browse files
dnm: Vendor changes from containers/container-libs#567
1 parent 6369907 commit 7dbf3ec

File tree

862 files changed

+177878
-1174
lines changed

Some content is hidden

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

862 files changed

+177878
-1174
lines changed

go.mod

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/containers/buildah
22

33
// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates
44

5-
go 1.24.6
5+
go 1.25.0
66

77
require (
88
github.com/containerd/platforms v1.0.0-rc.2
@@ -29,7 +29,7 @@ require (
2929
github.com/opencontainers/selinux v1.13.1
3030
github.com/openshift/imagebuilder v1.2.19
3131
github.com/seccomp/libseccomp-golang v0.11.1
32-
github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af
32+
github.com/sirupsen/logrus v1.9.4-0.20251023124752-b61f268f75b6
3333
github.com/spf13/cobra v1.10.2
3434
github.com/spf13/pflag v1.0.10
3535
github.com/stretchr/testify v1.11.1
@@ -41,7 +41,7 @@ require (
4141
golang.org/x/sync v0.19.0
4242
golang.org/x/sys v0.39.0
4343
golang.org/x/term v0.38.0
44-
tags.cncf.io/container-device-interface v1.0.2-0.20251120202831-139ffec09210
44+
tags.cncf.io/container-device-interface v1.1.0
4545
)
4646

4747
require (
@@ -53,6 +53,9 @@ require (
5353
github.com/VividCortex/ewma v1.2.0 // indirect
5454
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
5555
github.com/aead/serpent v0.0.0-20160714141033-fba169763ea6 // indirect
56+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
57+
github.com/blang/semver v3.5.1+incompatible // indirect
58+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
5659
github.com/chzyer/readline v1.5.1 // indirect
5760
github.com/clipperhouse/stringish v0.1.1 // indirect
5861
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
@@ -61,11 +64,13 @@ require (
6164
github.com/containerd/log v0.1.0 // indirect
6265
github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect
6366
github.com/containerd/typeurl/v2 v2.2.3 // indirect
64-
github.com/containernetworking/plugins v1.8.0 // indirect
67+
github.com/containernetworking/plugins v1.9.0 // indirect
6568
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
6669
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
6770
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
6871
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
72+
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
73+
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
6974
github.com/disiqueira/gotree/v3 v3.0.2 // indirect
7075
github.com/distribution/reference v0.6.0 // indirect
7176
github.com/docker/docker-credential-helpers v0.9.4 // indirect
@@ -74,18 +79,44 @@ require (
7479
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
7580
github.com/go-logr/logr v1.4.3 // indirect
7681
github.com/go-logr/stdr v1.2.2 // indirect
82+
github.com/go-openapi/analysis v0.24.1 // indirect
83+
github.com/go-openapi/errors v0.22.4 // indirect
84+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
85+
github.com/go-openapi/jsonreference v0.21.3 // indirect
86+
github.com/go-openapi/loads v0.23.2 // indirect
87+
github.com/go-openapi/runtime v0.29.2 // indirect
88+
github.com/go-openapi/spec v0.22.1 // indirect
89+
github.com/go-openapi/strfmt v0.25.0 // indirect
90+
github.com/go-openapi/swag v0.25.4 // indirect
91+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
92+
github.com/go-openapi/swag/conv v0.25.4 // indirect
93+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
94+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
95+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
96+
github.com/go-openapi/swag/loading v0.25.4 // indirect
97+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
98+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
99+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
100+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
101+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
102+
github.com/go-openapi/validate v0.25.1 // indirect
103+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
77104
github.com/godbus/dbus/v5 v5.2.0 // indirect
78105
github.com/gogo/protobuf v1.3.2 // indirect
79106
github.com/golang/protobuf v1.5.4 // indirect
80-
github.com/google/go-containerregistry v0.20.6 // indirect
107+
github.com/google/certificate-transparency-go v1.3.2 // indirect
108+
github.com/google/go-containerregistry v0.20.7 // indirect
81109
github.com/google/go-intervals v0.0.2 // indirect
82110
github.com/google/uuid v1.6.0 // indirect
83111
github.com/gorilla/mux v1.8.1 // indirect
112+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
84113
github.com/hashicorp/errwrap v1.1.0 // indirect
114+
github.com/in-toto/attestation v1.1.2 // indirect
115+
github.com/in-toto/in-toto-golang v0.9.0 // indirect
85116
github.com/inconshreveable/mousetrap v1.1.0 // indirect
86117
github.com/jinzhu/copier v0.4.0 // indirect
87118
github.com/json-iterator/go v1.1.12 // indirect
88-
github.com/klauspost/compress v1.18.1 // indirect
119+
github.com/klauspost/compress v1.18.2 // indirect
89120
github.com/klauspost/pgzip v1.2.6 // indirect
90121
github.com/manifoldco/promptui v0.9.0 // indirect
91122
github.com/mattn/go-runewidth v0.0.19 // indirect
@@ -104,38 +135,55 @@ require (
104135
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
105136
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
106137
github.com/morikuni/aec v1.0.0 // indirect
138+
github.com/oklog/ulid v1.3.1 // indirect
107139
github.com/pkg/errors v0.9.1 // indirect
108140
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
109141
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
110142
github.com/proglottis/gpgme v0.1.6 // indirect
111143
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
144+
github.com/shibumi/go-pathspec v1.3.0 // indirect
112145
github.com/sigstore/fulcio v1.8.1 // indirect
113146
github.com/sigstore/protobuf-specs v0.5.0 // indirect
114-
github.com/sigstore/sigstore v1.9.6-0.20251111174640-d8ab8afb1326 // indirect
147+
github.com/sigstore/rekor v1.4.3 // indirect
148+
github.com/sigstore/rekor-tiles/v2 v2.0.1 // indirect
149+
github.com/sigstore/sigstore v1.10.0 // indirect
150+
github.com/sigstore/sigstore-go v1.1.4 // indirect
151+
github.com/sigstore/timestamp-authority/v2 v2.0.3 // indirect
115152
github.com/smallstep/pkcs7 v0.1.1 // indirect
116153
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
117154
github.com/sylabs/sif/v2 v2.22.0 // indirect
118155
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
156+
github.com/theupdateframework/go-tuf/v2 v2.3.0 // indirect
157+
github.com/transparency-dev/formats v0.0.0-20251017110053-404c0d5b696c // indirect
158+
github.com/transparency-dev/merkle v0.0.2 // indirect
119159
github.com/ulikunitz/xz v0.5.15 // indirect
120160
github.com/vbatts/tar-split v0.12.2 // indirect
121161
github.com/vbauerster/mpb/v8 v8.11.2 // indirect
122162
github.com/vishvananda/netlink v1.3.1 // indirect
123163
github.com/vishvananda/netns v0.0.5 // indirect
164+
go.mongodb.org/mongo-driver v1.17.6 // indirect
124165
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
125166
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
126167
go.opentelemetry.io/otel v1.38.0 // indirect
127168
go.opentelemetry.io/otel/metric v1.38.0 // indirect
128169
go.opentelemetry.io/otel/trace v1.38.0 // indirect
129170
go.yaml.in/yaml/v2 v2.4.3 // indirect
171+
go.yaml.in/yaml/v3 v3.0.4 // indirect
130172
golang.org/x/mod v0.30.0 // indirect
131173
golang.org/x/net v0.47.0 // indirect
132174
golang.org/x/text v0.32.0 // indirect
133175
google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect
134-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
176+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
135177
google.golang.org/grpc v1.76.0 // indirect
136178
google.golang.org/protobuf v1.36.10 // indirect
137179
gopkg.in/yaml.v3 v3.0.1 // indirect
138180
k8s.io/klog v1.0.0 // indirect
139181
sigs.k8s.io/yaml v1.6.0 // indirect
140-
tags.cncf.io/container-device-interface/specs-go v1.0.1-0.20251120202831-139ffec09210 // indirect
182+
tags.cncf.io/container-device-interface/specs-go v1.1.0 // indirect
141183
)
184+
185+
replace go.podman.io/common => github.com/p5/containers-container-libs/common v0.0.0-20251224032800-1f0c30832b6a
186+
187+
replace go.podman.io/storage => github.com/p5/containers-container-libs/storage v0.0.0-20251224032800-1f0c30832b6a
188+
189+
replace go.podman.io/image/v5 => github.com/p5/containers-container-libs/image/v5 v5.0.0-20251224032800-1f0c30832b6a

0 commit comments

Comments
 (0)