Skip to content

Commit 883653e

Browse files
authored
Merge pull request #505 from nindsimonv/fix-PROJQUAY-10086_316
deps: upgrade of podman to 5.7.1 (PROJQUAY-10086) branch 316
2 parents 858e708 + 1c9afef commit 883653e

File tree

2 files changed

+128
-267
lines changed

2 files changed

+128
-267
lines changed

go.mod

Lines changed: 37 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -4,75 +4,58 @@ go 1.25.0
44

55
require (
66
code.cloudfoundry.org/archiver v0.0.0-20230612152321-46722cbc3f99
7-
github.com/containers/buildah v1.40.1
8-
github.com/containers/podman/v5 v5.5.2
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 v28.2.2+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.21.0
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
21+
dario.cat/mergo v1.0.2 // indirect
2222
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2323
github.com/BurntSushi/toml v1.5.0 // indirect
2424
github.com/Microsoft/go-winio v0.6.2 // indirect
25-
github.com/Microsoft/hcsshim v0.12.9 // indirect
2625
github.com/VividCortex/ewma v1.2.0 // indirect
2726
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
2827
github.com/aead/serpent v0.0.0-20160714141033-fba169763ea6 // indirect
2928
github.com/agext/levenshtein v1.2.3 // indirect
30-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3129
github.com/blang/semver/v4 v4.0.0 // indirect
3230
github.com/chzyer/readline v1.5.1 // indirect
33-
github.com/containerd/cgroups/v3 v3.0.5 // indirect
3431
github.com/containerd/errdefs v1.0.0 // indirect
3532
github.com/containerd/errdefs/pkg v0.3.0 // indirect
3633
github.com/containerd/log v0.1.0 // indirect
3734
github.com/containerd/platforms v1.0.0-rc.1 // indirect
38-
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
35+
github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
3936
github.com/containerd/typeurl/v2 v2.2.3 // indirect
4037
github.com/containernetworking/cni v1.3.0 // indirect
41-
github.com/containernetworking/plugins v1.6.2 // indirect
42-
github.com/containers/common v0.63.1 // indirect
43-
github.com/containers/image/v5 v5.35.0 // indirect
38+
github.com/containernetworking/plugins v1.8.0 // indirect
4439
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
45-
github.com/containers/luksy v0.0.0-20250217190002-40bd943d93b8 // indirect
40+
github.com/containers/luksy v0.0.0-20250910190358-2cf5bc928957 // indirect
4641
github.com/containers/ocicrypt v1.2.1 // indirect
47-
github.com/containers/psgo v1.9.0 // indirect
48-
github.com/containers/storage v1.58.0 // indirect
49-
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09 // indirect
42+
github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86 // indirect
43+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
5044
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
51-
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
45+
github.com/cyphar/filepath-securejoin v0.5.2 // indirect
5246
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5347
github.com/disiqueira/gotree/v3 v3.0.2 // indirect
5448
github.com/docker/distribution v2.8.3+incompatible // indirect
55-
github.com/docker/docker-credential-helpers v0.9.3 // indirect
56-
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
5751
github.com/docker/go-units v0.5.0 // indirect
5852
github.com/felixge/httpsnoop v1.0.4 // indirect
5953
github.com/fsnotify/fsnotify v1.9.0 // indirect
6054
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
6155
github.com/go-logr/logr v1.4.3 // indirect
6256
github.com/go-logr/stdr v1.2.2 // indirect
63-
github.com/go-openapi/analysis v0.23.0 // indirect
64-
github.com/go-openapi/errors v0.22.1 // indirect
65-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
66-
github.com/go-openapi/jsonreference v0.21.0 // indirect
67-
github.com/go-openapi/loads v0.22.0 // indirect
68-
github.com/go-openapi/runtime v0.28.0 // indirect
69-
github.com/go-openapi/spec v0.21.0 // indirect
70-
github.com/go-openapi/strfmt v0.23.0 // indirect
71-
github.com/go-openapi/swag v0.23.1 // indirect
72-
github.com/go-openapi/validate v0.24.0 // indirect
7357
github.com/godbus/dbus/v5 v5.1.1-0.20241109141217-c266b19b28e9 // indirect
7458
github.com/gogo/protobuf v1.3.2 // indirect
75-
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
7659
github.com/google/go-containerregistry v0.20.6 // indirect
7760
github.com/google/go-intervals v0.0.2 // indirect
7861
github.com/google/uuid v1.6.0 // indirect
@@ -81,20 +64,17 @@ require (
8164
github.com/hashicorp/go-multierror v1.1.1 // indirect
8265
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8366
github.com/jinzhu/copier v0.4.0 // indirect
84-
github.com/josharian/intern v1.0.0 // indirect
8567
github.com/json-iterator/go v1.1.12 // indirect
86-
github.com/kevinburke/ssh_config v1.2.0 // indirect
68+
github.com/kevinburke/ssh_config v1.4.0 // indirect
8769
github.com/klauspost/compress v1.18.0 // indirect
8870
github.com/klauspost/pgzip v1.2.6 // indirect
8971
github.com/kr/fs v0.1.0 // indirect
90-
github.com/mailru/easyjson v0.9.0 // indirect
9172
github.com/manifoldco/promptui v0.9.0 // indirect
9273
github.com/mattn/go-runewidth v0.0.16 // indirect
9374
github.com/mattn/go-shellwords v1.0.12 // indirect
94-
github.com/mattn/go-sqlite3 v1.14.28 // indirect
75+
github.com/mattn/go-sqlite3 v1.14.32 // indirect
9576
github.com/miekg/pkcs11 v1.1.1 // indirect
96-
github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
97-
github.com/mitchellh/mapstructure v1.5.0 // indirect
77+
github.com/mistifyio/go-zfs/v3 v3.1.0 // indirect
9878
github.com/moby/docker-image-spec v1.3.1 // indirect
9979
github.com/moby/go-archive v0.1.0 // indirect
10080
github.com/moby/patternmatcher v0.6.0 // indirect
@@ -108,50 +88,48 @@ require (
10888
github.com/modern-go/reflect2 v1.0.2 // indirect
10989
github.com/morikuni/aec v1.0.0 // indirect
11090
github.com/nxadm/tail v1.4.11 // indirect
111-
github.com/oklog/ulid v1.3.1 // indirect
112-
github.com/opencontainers/cgroups v0.0.1 // indirect
91+
github.com/opencontainers/cgroups v0.0.5 // indirect
11392
github.com/opencontainers/go-digest v1.0.0 // indirect
11493
github.com/opencontainers/image-spec v1.1.1 // indirect
115-
github.com/opencontainers/runc v1.2.6 // indirect
94+
github.com/opencontainers/runc v1.3.4 // indirect
11695
github.com/opencontainers/runtime-spec v1.2.1 // indirect
117-
github.com/opencontainers/runtime-tools v0.9.1-0.20250303011046-260e151b8552 // indirect
118-
github.com/opencontainers/selinux v1.12.0 // indirect
119-
github.com/openshift/imagebuilder v1.2.16-0.20250224193648-e87e4e105fd8 // indirect
120-
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
96+
github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 // indirect
97+
github.com/opencontainers/selinux v1.13.1 // indirect
98+
github.com/openshift/imagebuilder v1.2.19 // indirect
12199
github.com/pkg/errors v0.9.1 // indirect
122100
github.com/pkg/sftp v1.13.9 // indirect
123101
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
124102
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
125-
github.com/proglottis/gpgme v0.1.4 // indirect
103+
github.com/proglottis/gpgme v0.1.5 // indirect
126104
github.com/rivo/uniseg v0.4.7 // indirect
127-
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
105+
github.com/seccomp/libseccomp-golang v0.11.1 // indirect
128106
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
129107
github.com/sigstore/fulcio v1.8.3 // indirect
130108
github.com/sigstore/protobuf-specs v0.5.0 // indirect
131-
github.com/sigstore/rekor v1.3.10 // indirect
132109
github.com/sigstore/sigstore v1.10.0 // indirect
133-
github.com/skeema/knownhosts v1.3.1 // indirect
110+
github.com/skeema/knownhosts v1.3.2 // indirect
134111
github.com/smallstep/pkcs7 v0.1.1 // indirect
135112
github.com/spf13/cobra v1.10.2 // indirect
136113
github.com/spf13/pflag v1.0.10 // indirect
137114
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
138-
github.com/sylabs/sif/v2 v2.21.1 // indirect
139-
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
140-
github.com/tchap/go-patricia/v2 v2.3.2 // indirect
141-
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
142-
github.com/ulikunitz/xz v0.5.12 // indirect
115+
github.com/sylabs/sif/v2 v2.22.0 // indirect
116+
github.com/tchap/go-patricia/v2 v2.3.3 // indirect
117+
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirect
118+
github.com/ulikunitz/xz v0.5.15 // indirect
143119
github.com/vbatts/tar-split v0.12.2 // indirect
144-
github.com/vbauerster/mpb/v8 v8.9.3 // indirect
145-
github.com/vishvananda/netlink v1.3.1-0.20250221194427-0af32151e72b // indirect
120+
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
121+
github.com/vishvananda/netlink v1.3.1 // indirect
146122
github.com/vishvananda/netns v0.0.5 // indirect
147-
go.etcd.io/bbolt v1.4.0 // indirect
148-
go.mongodb.org/mongo-driver v1.14.0 // indirect
149-
go.opencensus.io v0.24.0 // indirect
123+
go.etcd.io/bbolt v1.4.3 // indirect
150124
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
151125
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
152126
go.opentelemetry.io/otel v1.38.0 // indirect
153127
go.opentelemetry.io/otel/metric v1.38.0 // indirect
154128
go.opentelemetry.io/otel/trace v1.38.0 // indirect
129+
go.podman.io/common v0.66.1 // indirect
130+
go.podman.io/image/v5 v5.38.0 // indirect
131+
go.podman.io/storage v1.61.0 // indirect
132+
go.yaml.in/yaml/v2 v2.4.3 // indirect
155133
golang.org/x/crypto v0.45.0 // indirect
156134
golang.org/x/mod v0.29.0 // indirect
157135
golang.org/x/net v0.47.0 // indirect
@@ -163,7 +141,7 @@ require (
163141
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
164142
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
165143
gopkg.in/yaml.v3 v3.0.1 // indirect
166-
sigs.k8s.io/yaml v1.4.0 // indirect
144+
sigs.k8s.io/yaml v1.6.0 // indirect
167145
tags.cncf.io/container-device-interface v1.0.1 // indirect
168146
tags.cncf.io/container-device-interface/specs-go v1.0.0 // indirect
169147
)

0 commit comments

Comments
 (0)