Skip to content

Commit 8d112de

Browse files
authored
Merge pull request #510 from nindsimonv/fix-PROJQUAY-10076_310
[redhat-3.10] deps: upgrade of podman to 5.7.1 (PROJQUAY-10076) branch 310
2 parents f0fc1b3 + f689bd0 commit 8d112de

File tree

2 files changed

+211
-312
lines changed

2 files changed

+211
-312
lines changed

go.mod

Lines changed: 48 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -4,100 +4,80 @@ go 1.25.0
44

55
require (
66
code.cloudfoundry.org/archiver v0.0.0-20230612152321-46722cbc3f99
7-
github.com/containers/buildah v1.37.6
8-
github.com/containers/podman/v5 v5.2.5
7+
github.com/containers/buildah v1.42.2
8+
github.com/containers/podman/v5 v5.7.1
99
github.com/distribution/reference v0.6.0
10-
github.com/docker/docker v27.3.1+incompatible
11-
github.com/fsouza/go-dockerclient v1.12.0
10+
github.com/docker/docker v28.5.1+incompatible
11+
github.com/fsouza/go-dockerclient v1.12.2
1212
github.com/golang/protobuf v1.5.4
13-
github.com/moby/buildkit v0.17.3
13+
github.com/moby/buildkit v0.25.1
1414
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
1515
github.com/sirupsen/logrus v1.9.3
1616
google.golang.org/grpc v1.77.0
1717
google.golang.org/protobuf v1.36.10
1818
)
1919

2020
require (
21-
dario.cat/mergo v1.0.1 // indirect
22-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
21+
dario.cat/mergo v1.0.2 // indirect
2322
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
24-
github.com/BurntSushi/toml v1.4.0 // indirect
23+
github.com/BurntSushi/toml v1.5.0 // indirect
2524
github.com/Microsoft/go-winio v0.6.2 // indirect
26-
github.com/Microsoft/hcsshim v0.12.9 // indirect
2725
github.com/VividCortex/ewma v1.2.0 // indirect
2826
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
2927
github.com/aead/serpent v0.0.0-20160714141033-fba169763ea6 // indirect
3028
github.com/agext/levenshtein v1.2.3 // indirect
31-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3229
github.com/blang/semver/v4 v4.0.0 // indirect
3330
github.com/chzyer/readline v1.5.1 // indirect
34-
github.com/containerd/cgroups/v3 v3.0.3 // indirect
35-
github.com/containerd/containerd v1.7.23 // indirect
3631
github.com/containerd/errdefs v1.0.0 // indirect
3732
github.com/containerd/errdefs/pkg v0.3.0 // indirect
3833
github.com/containerd/log v0.1.0 // indirect
39-
github.com/containerd/platforms v0.2.1 // indirect
40-
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
34+
github.com/containerd/platforms v1.0.0-rc.1 // indirect
35+
github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
4136
github.com/containerd/typeurl/v2 v2.2.3 // indirect
42-
github.com/containernetworking/cni v1.2.3 // indirect
43-
github.com/containernetworking/plugins v1.5.1 // indirect
44-
github.com/containers/common v0.60.4 // indirect
45-
github.com/containers/image/v5 v5.32.2 // indirect
37+
github.com/containernetworking/cni v1.3.0 // indirect
38+
github.com/containernetworking/plugins v1.8.0 // indirect
4639
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
4740
github.com/containers/luksy v0.0.0-20251013183210-adfea1d56c77 // indirect
48-
github.com/containers/ocicrypt v1.2.0 // indirect
49-
github.com/containers/psgo v1.9.0 // indirect
50-
github.com/containers/storage v1.55.2 // indirect
51-
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09 // indirect
41+
github.com/containers/ocicrypt v1.2.1 // indirect
42+
github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86 // indirect
43+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
5244
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
53-
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
45+
github.com/cyphar/filepath-securejoin v0.5.2 // indirect
5446
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5547
github.com/disiqueira/gotree/v3 v3.0.2 // indirect
5648
github.com/docker/distribution v2.8.3+incompatible // indirect
57-
github.com/docker/docker-credential-helpers v0.9.3 // indirect
58-
github.com/docker/go-connections v0.5.0 // indirect
49+
github.com/docker/docker-credential-helpers v0.9.4 // indirect
50+
github.com/docker/go-connections v0.6.0 // indirect
5951
github.com/docker/go-units v0.5.0 // indirect
6052
github.com/felixge/httpsnoop v1.0.4 // indirect
6153
github.com/fsnotify/fsnotify v1.9.0 // indirect
6254
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
6355
github.com/go-logr/logr v1.4.3 // indirect
6456
github.com/go-logr/stdr v1.2.2 // indirect
65-
github.com/go-openapi/analysis v0.23.0 // indirect
66-
github.com/go-openapi/errors v0.22.0 // indirect
67-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
68-
github.com/go-openapi/jsonreference v0.21.0 // indirect
69-
github.com/go-openapi/loads v0.22.0 // indirect
70-
github.com/go-openapi/runtime v0.28.0 // indirect
71-
github.com/go-openapi/spec v0.21.0 // indirect
72-
github.com/go-openapi/strfmt v0.23.0 // indirect
73-
github.com/go-openapi/swag v0.23.0 // indirect
74-
github.com/go-openapi/validate v0.24.0 // indirect
7557
github.com/godbus/dbus/v5 v5.1.1-0.20241109141217-c266b19b28e9 // indirect
7658
github.com/gogo/protobuf v1.3.2 // indirect
77-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
78-
github.com/google/go-containerregistry v0.20.2 // indirect
59+
github.com/google/go-containerregistry v0.20.6 // indirect
7960
github.com/google/go-intervals v0.0.2 // indirect
8061
github.com/google/uuid v1.6.0 // indirect
8162
github.com/gorilla/mux v1.8.1 // indirect
8263
github.com/hashicorp/errwrap v1.1.0 // indirect
8364
github.com/hashicorp/go-multierror v1.1.1 // indirect
8465
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8566
github.com/jinzhu/copier v0.4.0 // indirect
86-
github.com/josharian/intern v1.0.0 // indirect
8767
github.com/json-iterator/go v1.1.12 // indirect
68+
github.com/kevinburke/ssh_config v1.4.0 // indirect
8869
github.com/klauspost/compress v1.18.2 // indirect
8970
github.com/klauspost/pgzip v1.2.6 // indirect
9071
github.com/kr/fs v0.1.0 // indirect
9172
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
92-
github.com/mailru/easyjson v0.7.7 // indirect
9373
github.com/manifoldco/promptui v0.9.0 // indirect
9474
github.com/mattn/go-runewidth v0.0.16 // indirect
9575
github.com/mattn/go-shellwords v1.0.12 // indirect
96-
github.com/mattn/go-sqlite3 v1.14.28 // indirect
76+
github.com/mattn/go-sqlite3 v1.14.32 // indirect
9777
github.com/miekg/pkcs11 v1.1.1 // indirect
98-
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
99-
github.com/mitchellh/mapstructure v1.5.0 // indirect
78+
github.com/mistifyio/go-zfs/v3 v3.1.0 // indirect
10079
github.com/moby/docker-image-spec v1.3.1 // indirect
80+
github.com/moby/go-archive v0.1.0 // indirect
10181
github.com/moby/patternmatcher v0.6.0 // indirect
10282
github.com/moby/sys/capability v0.4.0 // indirect
10383
github.com/moby/sys/mountinfo v0.7.2 // indirect
@@ -109,51 +89,50 @@ require (
10989
github.com/modern-go/reflect2 v1.0.2 // indirect
11090
github.com/morikuni/aec v1.0.0 // indirect
11191
github.com/nxadm/tail v1.4.11 // indirect
112-
github.com/oklog/ulid v1.3.1 // indirect
92+
github.com/opencontainers/cgroups v0.0.5 // indirect
11393
github.com/opencontainers/go-digest v1.0.0 // indirect
11494
github.com/opencontainers/image-spec v1.1.1 // indirect
115-
github.com/opencontainers/runc v1.2.0-rc.3 // indirect
116-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
95+
github.com/opencontainers/runc v1.3.4 // indirect
96+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
11797
github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 // indirect
118-
github.com/opencontainers/selinux v1.11.1 // indirect
119-
github.com/openshift/imagebuilder v1.2.15 // indirect
120-
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
98+
github.com/opencontainers/selinux v1.13.1 // indirect
99+
github.com/openshift/imagebuilder v1.2.19 // indirect
121100
github.com/pkg/errors v0.9.1 // indirect
122-
github.com/pkg/sftp v1.13.7 // indirect
101+
github.com/pkg/sftp v1.13.9 // indirect
123102
github.com/planetscale/vtprotobuf v0.6.1-0.20250313105119-ba97887b0a25 // indirect
124103
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
125-
github.com/proglottis/gpgme v0.1.3 // indirect
104+
github.com/proglottis/gpgme v0.1.5 // indirect
126105
github.com/rivo/uniseg v0.4.7 // indirect
127-
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
106+
github.com/seccomp/libseccomp-golang v0.11.1 // indirect
128107
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
129-
github.com/sigstore/fulcio v1.6.6 // indirect
108+
github.com/sigstore/fulcio v1.7.1 // indirect
130109
github.com/sigstore/protobuf-specs v0.5.0 // indirect
131-
github.com/sigstore/rekor v1.3.6 // indirect
132-
github.com/sigstore/sigstore v1.8.15 // indirect
110+
github.com/sigstore/sigstore v1.9.5 // indirect
111+
github.com/skeema/knownhosts v1.3.2 // indirect
112+
github.com/smallstep/pkcs7 v0.1.1 // indirect
133113
github.com/spf13/cobra v1.10.2 // indirect
134114
github.com/spf13/pflag v1.0.10 // indirect
135115
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
136-
github.com/sylabs/sif/v2 v2.19.1 // indirect
137-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
138-
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
116+
github.com/sylabs/sif/v2 v2.22.0 // indirect
117+
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
139118
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
140119
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirect
141-
github.com/ulikunitz/xz v0.5.12 // indirect
120+
github.com/ulikunitz/xz v0.5.15 // indirect
142121
github.com/vbatts/tar-split v0.12.1 // indirect
143-
github.com/vbauerster/mpb/v8 v8.8.3 // indirect
144-
github.com/vishvananda/netlink v1.3.0 // indirect
145-
github.com/vishvananda/netns v0.0.4 // indirect
146-
go.etcd.io/bbolt v1.4.0 // indirect
147-
go.mongodb.org/mongo-driver v1.14.0 // indirect
148-
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
149-
go.opencensus.io v0.24.0 // indirect
122+
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
123+
github.com/vishvananda/netlink v1.3.1 // indirect
124+
github.com/vishvananda/netns v0.0.5 // indirect
125+
go.etcd.io/bbolt v1.4.3 // indirect
150126
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
151127
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
152128
go.opentelemetry.io/otel v1.38.0 // indirect
153129
go.opentelemetry.io/otel/metric v1.38.0 // indirect
154130
go.opentelemetry.io/otel/trace v1.38.0 // indirect
131+
go.podman.io/common v0.66.1 // indirect
132+
go.podman.io/image/v5 v5.38.0 // indirect
133+
go.podman.io/storage v1.61.0 // indirect
134+
go.yaml.in/yaml/v2 v2.4.2 // indirect
155135
golang.org/x/crypto v0.45.0 // indirect
156-
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
157136
golang.org/x/mod v0.29.0 // indirect
158137
golang.org/x/net v0.47.0 // indirect
159138
golang.org/x/sync v0.18.0 // indirect
@@ -164,8 +143,7 @@ require (
164143
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
165144
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
166145
gopkg.in/yaml.v3 v3.0.1 // indirect
167-
gotest.tools/v3 v3.5.2 // indirect
168-
sigs.k8s.io/yaml v1.4.0 // indirect
169-
tags.cncf.io/container-device-interface v0.8.0 // indirect
170-
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
146+
sigs.k8s.io/yaml v1.6.0 // indirect
147+
tags.cncf.io/container-device-interface v1.0.1 // indirect
148+
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
171149
)

0 commit comments

Comments
 (0)